h48

commit 45eddc73d44f59d82fcf93e2213bb972c6b7c86a
parent 4d0e55e9def2ba1eaca5b2289ca5b30e951f4d97
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date:   Wed, 12 Mar 2025 15:40:48 +0100

Revert "Temporary fix for tools"

This reverts commit 4d0e55e9def2ba1eaca5b2289ca5b30e951f4d97.

Diffstat:
M
TODO_COORDINATES
 | 
3
+--
M
tools/300_solve_small/solve_small.c
 | 
2
+-
M
tools/301_solve_file/solve_file.c
 | 
2
+-
M
tools/302_solve_multisol/solve_multisol.c
 | 
2
+-
M
tools/400_solvetest/solve_test.c
 | 
4
++--

5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/TODO_COORDINATES b/TODO_COORDINATES
@@ -4,12 +4,11 @@
     - fix
   - h48 solve dispatch: move "h7k2" part to "options"?
     - it makes sense, but breaks the rule "solver == table"
-    - if so, adjust tools that use nissy_solve()
   - add new parameter to solve(): options (char *)
     - fix all usages
       x tests
       x shell
-      x tools
+      - tools (after deciding if refactoring h48 solve dispatch)
       x python bindings
       - document what to do when changing interface?
     - where do I document which solvers take which parameters?
diff --git a/tools/300_solve_small/solve_small.c b/tools/300_solve_small/solve_small.c
@@ -36,7 +36,7 @@ void run(void) {
 			printf("Invalid scramble\n");
 			continue;
 		}
-		n = nissy_solve(cube, solver, "", NISSY_NISSFLAG_NORMAL,
+		n = nissy_solve(cube, solver, NISSY_NISSFLAG_NORMAL,
 		    0, 20, 1, -1, 0, size, buf, SOL_BUFFER_LEN, sol, stats);
 		if (n == 0)
 			printf("No solution found\n");
diff --git a/tools/301_solve_file/solve_file.c b/tools/301_solve_file/solve_file.c
@@ -23,7 +23,7 @@ void run(void) {
 			printf("Invalid scramble\n");
 			continue;
 		}
-		nsols = nissy_solve(cube, solver, "", NISSY_NISSFLAG_NORMAL,
+		nsols = nissy_solve(cube, solver, NISSY_NISSFLAG_NORMAL,
 		    0, 20, 1, -1, 0, size, buf, SOL_BUFFER_LEN, sol, stats);
 		if (nsols == 0)
 			printf("No solution found\n");
diff --git a/tools/302_solve_multisol/solve_multisol.c b/tools/302_solve_multisol/solve_multisol.c
@@ -29,7 +29,7 @@ void run(void) {
 			printf("Invalid scramble\n");
 			continue;
 		}
-		n = nissy_solve(cube, solver, "", NISSY_NISSFLAG_NORMAL,
+		n = nissy_solve(cube, solver, NISSY_NISSFLAG_NORMAL,
 		    0, 20, nsol, -1, 0, size, buf, SOL_BUFFER_LEN, sol, stats);
 		if (n == 0)
 			printf("No solution found\n");
diff --git a/tools/400_solvetest/solve_test.c b/tools/400_solvetest/solve_test.c
@@ -57,7 +57,7 @@ void run(void) {
 			printf("Invalid scramble\n");
 			continue;
 		}
-		n = nissy_solve(cube, solver, "", NISSY_NISSFLAG_NORMAL,
+		n = nissy_solve(cube, solver, NISSY_NISSFLAG_NORMAL,
 		    0, 20, 1, -1, 0, size, buf, SOL_BUFFER_LEN, sol, stats);
 		if (n == 0) {
 			printf("Error: no solution\n");
@@ -78,7 +78,7 @@ void run(void) {
 			printf("Invalid scramble\n");
 			continue;
 		}
-		n = nissy_solve(cube, solver, "", NISSY_NISSFLAG_NORMAL,
+		n = nissy_solve(cube, solver, NISSY_NISSFLAG_NORMAL,
 		    0, 20, 100, 0, 0, size, buf, SOL_BUFFER_LEN, sol, stats);
 		if (check_all(sol, s[i].solutions)) {
 			printf("All solutions are correct\n");