From 4d0e55e9def2ba1eaca5b2289ca5b30e951f4d97 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Sun, 9 Mar 2025 18:11:23 +0100 Subject: Temporary fix for tools --- TODO_COORDINATES | 3 ++- tools/300_solve_small/solve_small.c | 2 +- tools/301_solve_file/solve_file.c | 2 +- tools/302_solve_multisol/solve_multisol.c | 2 +- tools/400_solvetest/solve_test.c | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/TODO_COORDINATES b/TODO_COORDINATES index 1c50db3..3bb516c 100644 --- a/TODO_COORDINATES +++ b/TODO_COORDINATES @@ -4,11 +4,12 @@ - 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 - - tools (after deciding if refactoring h48 solve dispatch) + x tools 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 index 073de89..1a2f034 100644 --- 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 index fe41bb7..877be96 100644 --- 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 index a03c2a0..7db2738 100644 --- 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 index 9b6c094..d4d5c68 100644 --- 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"); -- cgit v1.3