Fix duplicate solutions, overflow in maxsols and improve symmetry reduction for H48.

This commit fixes two bugs:
  - A bug that caused duplicates solutions for symmetric scrambles.
  - An overflow in the maxsols parameter for the H48 solver, which
    caused it to find much fewer solutions than existed.

Moreover, the H48 solvers has been improved by reducing by symmetry not
only from the starting position, but also up to the first 4 moves.

14 files changed, 45 insertions, 9 deletions

diff --git a/test/140_appendsolution/00_empty.in b/test/140_appendsolution/00_empty.in
index 1100b95..00546ef 100644
--- a/test/140_appendsolution/00_empty.in
+++ b/test/140_appendsolution/00_empty.in
@@ -1,5 +1,6 @@
 
 0
 1
+1
 rotation UF
 0
diff --git a/test/140_appendsolution/01_simple_onlynormal_nounniss.in b/test/140_appendsolution/01_simple_onlynormal_nounniss.in
index fb1eaed..84d16c0 100644
--- a/test/140_appendsolution/01_simple_onlynormal_nounniss.in
+++ b/test/140_appendsolution/01_simple_onlynormal_nounniss.in
@@ -1,5 +1,6 @@
 U F R D2 B'
 0
 1
+1
 rotation UF
 0
diff --git a/test/140_appendsolution/02_simple_onlynormal_nounnis_multitrans.in b/test/140_appendsolution/02_simple_onlynormal_nounnis_multitrans.in
index db5f074..15ff39e 100644
--- a/test/140_appendsolution/02_simple_onlynormal_nounnis_multitrans.in
+++ b/test/140_appendsolution/02_simple_onlynormal_nounnis_multitrans.in
@@ -1,5 +1,6 @@
 U F R
 0
+1
 4
 rotation UF
 mirrored UR
diff --git a/test/140_appendsolution/03_simple_unniss.in b/test/140_appendsolution/03_simple_unniss.in
index 2c5a331..ac6fe72 100644
--- a/test/140_appendsolution/03_simple_unniss.in
+++ b/test/140_appendsolution/03_simple_unniss.in
@@ -1,5 +1,6 @@
 U F B2 (R' F D)
 1
 1
+1
 rotation UF
 0
diff --git a/test/140_appendsolution/04_niss_nounniss.in b/test/140_appendsolution/04_niss_nounniss.in
index b07f970..cae1328 100644
--- a/test/140_appendsolution/04_niss_nounniss.in
+++ b/test/140_appendsolution/04_niss_nounniss.in
@@ -1,5 +1,6 @@
 U F B2 (R' F D)
 0
 1
+1
 rotation UF
 0
diff --git a/test/140_appendsolution/05_sort_parallel.in b/test/140_appendsolution/05_sort_parallel.in
index bc1cf0f..85351b5 100644
--- a/test/140_appendsolution/05_sort_parallel.in
+++ b/test/140_appendsolution/05_sort_parallel.in
@@ -1,5 +1,6 @@
 L R' B2 F
 0
 1
+1
 rotation UF
 0
diff --git a/test/140_appendsolution/06_unniss_trans_sort.in b/test/140_appendsolution/06_unniss_trans_sort.in
index 2ffab93..e6b7897 100644
--- a/test/140_appendsolution/06_unniss_trans_sort.in
+++ b/test/140_appendsolution/06_unniss_trans_sort.in
@@ -1,5 +1,6 @@
 B (R2 F2)
 1
 1
+1
 rotation UR
 0
diff --git a/test/140_appendsolution/07_unniss_cancel_nosol.in b/test/140_appendsolution/07_unniss_cancel_nosol.in
index 6883d05..4faed6b 100644
--- a/test/140_appendsolution/07_unniss_cancel_nosol.in
+++ b/test/140_appendsolution/07_unniss_cancel_nosol.in
@@ -1,5 +1,6 @@
 B' F (R2 B2)
 1
 1
+1
 rotation UF
 0
diff --git a/test/140_appendsolution/08_unniss_cancel_nosol_v2.in b/test/140_appendsolution/08_unniss_cancel_nosol_v2.in
index 3d461f0..741687a 100644
--- a/test/140_appendsolution/08_unniss_cancel_nosol_v2.in
+++ b/test/140_appendsolution/08_unniss_cancel_nosol_v2.in
@@ -1,5 +1,6 @@
 F' B (R2 F2)
 1
 1
+1
 rotation UF
 0
diff --git a/test/140_appendsolution/09_fullinverse_niss.in b/test/140_appendsolution/09_fullinverse_niss.in
index bb2b640..e2e5f7b 100644
--- a/test/140_appendsolution/09_fullinverse_niss.in
+++ b/test/140_appendsolution/09_fullinverse_niss.in
@@ -1,5 +1,6 @@
 (F)
 0
 1
+1
 rotation UF
 0
diff --git a/test/140_appendsolution/10_rotated.in b/test/140_appendsolution/10_rotated.in
index 5210cd5..947696f 100644
--- a/test/140_appendsolution/10_rotated.in
+++ b/test/140_appendsolution/10_rotated.in
@@ -1,5 +1,6 @@
 U2 F B L'
 1
 1
+1
 rotation UF
 7
diff --git a/test/140_appendsolution/11_multisym.in b/test/140_appendsolution/11_multisym.in
new file mode 100644
index 0000000..947127f
--- /dev/null
+++ b/test/140_appendsolution/11_multisym.in
@@ -0,0 +1,10 @@
+L U F
+0
+2
+2
+rotation UF
+rotation UB
+2
+rotation UF
+rotation DR
+0
diff --git a/test/140_appendsolution/11_multisym.out b/test/140_appendsolution/11_multisym.out
new file mode 100644
index 0000000..9f1a312
--- /dev/null
+++ b/test/140_appendsolution/11_multisym.out
@@ -0,0 +1,7 @@
+L U F
+L D R
+R U B
+R D L
+Number of solutions: 4
+Shortest solution length: 3
+Used bytes: 24
diff --git a/test/140_appendsolution/appendsolution_tests.c b/test/140_appendsolution/appendsolution_tests.c
index d4c2a1f..f9620ab 100644
--- a/test/140_appendsolution/appendsolution_tests.c
+++ b/test/140_appendsolution/appendsolution_tests.c
@@ -3,8 +3,10 @@ Input format for appendsolution tests:
 
 moves on normal (with NISS notation)
 unniss flag (0=false, 1=true)
-number of transformations
-transformations, one per line
+n = maximum number of moves for transformations + 1 (at most 20)
+n times the following:
+  number of transformations
+  transformations, one per line
 the orientation of the cube, as a number from 0 to 23
 
 See below for the output format.
@@ -18,11 +20,13 @@ int64_t readmoves(const char *, size_t n, size_t m,
 void solution_moves_reset(solution_moves_t [static 1]);
 bool solution_list_init(solution_list_t [static 1], size_t n, char [n]);
 int64_t appendsolution(const solution_moves_t [static 1],
-    const solution_settings_t [static 1], solution_list_t [static 1]);
+    size_t, const uint64_t *, const solution_settings_t [static 1],
+    solution_list_t [static 1]);
 
 void run(void) {
-        int i, ntrans;
+        int i, j, nnt, ntrans;
         int64_t tot;
+        uint64_t tmask[20];
         size_t nm, np;
         char str[STRLENMAX], buf[STRLENMAX];
         solution_moves_t moves;
@@ -32,7 +36,6 @@ void run(void) {
         solution_moves_reset(&moves);
         solution_list_init(&list, STRLENMAX, buf);
         settings = (solution_settings_t) {
-                .tmask = UINT64_C(0),
                 .unniss = false,
                 .maxmoves = 20,
                 .maxsolutions = 100,
@@ -49,16 +52,21 @@ void run(void) {
         moves.npremoves = np;
         fgets(str, STRLENMAX, stdin);
         settings.unniss = (bool)atoi(str);
+
         fgets(str, STRLENMAX, stdin);
-        ntrans = atoi(str);
-        for (i = 0; i < ntrans; i++) {
+        nnt = atoi(str);
+        for (j = 0; j < nnt; j++) {
                 fgets(str, STRLENMAX, stdin);
-                settings.tmask |= UINT64_C(1) << (uint64_t)readtrans(str);
+                ntrans = atoi(str);
+                for (i = 0; i < ntrans; i++) {
+                        fgets(str, STRLENMAX, stdin);
+                        tmask[j] |= UINT64_C(1) << (uint64_t)readtrans(str);
+                }
         }
         fgets(str, STRLENMAX, stdin);
         settings.orientation = atoi(str);
 
-        appendsolution(&moves, &settings, &list);
+        appendsolution(&moves, nnt, tmask, &settings, &list);
 
         printf("%s", list.buf);
         printf("Number of solutions: %" PRIu64 "\n", list.nsols);