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.

2 files changed, 10 insertions, 8 deletions

diff --git a/src/solvers/coord/multisolve.h b/src/solvers/coord/multisolve.h
index f3589e8..a45bd6a 100644
--- a/src/solvers/coord/multisolve.h
+++ b/src/solvers/coord/multisolve.h
@@ -9,6 +9,7 @@ typedef struct {
         uint8_t target_depth;
         solution_moves_t *solution_moves;
         solution_settings_t *solution_settings;
+        uint64_t tmask;
         solution_list_t *solution_list;
         multicoord_t *mcoord;
         const unsigned char *coord_data[MAX_MULTICOORD_NCOORDS];
@@ -87,7 +88,7 @@ solve_multicoord_dfs(dfsarg_solve_multicoord_t arg[static 1])
         /* All coordinates are solved */
         if (!multicoord_solution_admissible(arg))
                 return 0;
-        return appendsolution(arg->solution_moves,
+        return appendsolution(arg->solution_moves, 1, &arg->tmask,
             arg->solution_settings, arg->solution_list);
 
 solve_multicoord_dfs_notsolved:
@@ -208,7 +209,6 @@ solve_multicoord(
         solution_moves_reset(&solution_moves);
 
         solution_settings = (solution_settings_t) {
-                .tmask = TM_SINGLE(inverse_trans(trans)),
                 .unniss = false,
                 .maxmoves = maxmoves,
                 .maxsolutions = maxsolutions,
@@ -222,6 +222,7 @@ solve_multicoord(
                 .mcoord = mcoord,
                 .solution_moves = &solution_moves,
                 .solution_settings = &solution_settings,
+                .tmask = TM_SINGLE(inverse_trans(trans)),
                 .solution_list = &solution_list,
         };
 
@@ -258,8 +259,8 @@ solve_multicoord(
         }
 
         /* All coordinates are solved */
-        if (minmoves == 0 && !appendsolution(&solution_moves,
-            &solution_settings, &solution_list))
+        if (minmoves == 0 && !appendsolution(&solution_moves, 1,
+            &arg.tmask, &solution_settings, &solution_list))
                 goto solve_multicoord_error_buffer;
         goto solve_multicoord_done;
 
diff --git a/src/solvers/coord/solve.h b/src/solvers/coord/solve.h
index 54309b1..9ea6d1a 100644
--- a/src/solvers/coord/solve.h
+++ b/src/solvers/coord/solve.h
@@ -3,6 +3,7 @@ typedef struct {
         cube_t inverse;
         uint8_t target_depth;
         solution_moves_t *solution_moves;
+        uint64_t tmask;
         solution_settings_t *solution_settings;
         solution_list_t *solution_list;
         uint8_t nissflag;
@@ -163,7 +164,7 @@ solve_coord_dfs(dfsarg_solve_coord_t arg[static 1])
         if (coord_is_solved(arg->coord, coord, arg->coord_data)) {
                 if (!coord_solution_admissible(arg))
                         return 0;
-                return appendsolution(arg->solution_moves,
+                return appendsolution(arg->solution_moves, 1, &arg->tmask,
                     arg->solution_settings, arg->solution_list);
         }
 
@@ -339,7 +340,6 @@ solve_coord(
         solution_moves_reset(&solution_moves);
 
         solution_settings = (solution_settings_t) {
-                .tmask = TM_SINGLE(inverse_trans(trans)),
                 .unniss = false,
                 .maxmoves = maxmoves,
                 .maxsolutions = maxsolutions,
@@ -355,14 +355,15 @@ solve_coord(
                 .ptable = ptable,
                 .solution_moves = &solution_moves,
                 .solution_settings = &solution_settings,
+                .tmask = TM_SINGLE(inverse_trans(trans)),
                 .solution_list = &solution_list,
                 .nissflag = nissflag,
         };
 
         i = coord->coord(c, coord_data);
         if (coord_is_solved(coord, i, coord_data)) {
-                if (minmoves == 0 && !appendsolution(&solution_moves,
-                    &solution_settings, &solution_list))
+                if (minmoves == 0 && !appendsolution(&solution_moves, 1,
+                    &arg.tmask, &solution_settings, &solution_list))
                                 goto solve_coord_error_buffer;
                 goto solve_coord_done;
         }