nissy-core

commit ad9c99d0274b09b152007332cef589f5e649080a
parent eed4de7f91d1013a842161f8e36c809d78573c4c
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date:   Wed, 17 Dec 2025 07:58:32 +0100

Move some checks around, small improvement

Diffstat:
M
src/solvers/h48/solve.h
 | 
20
+++++++++-----------

1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h
@@ -112,19 +112,13 @@ solve_h48_stop(dfsarg_solve_h48_t arg[static 1])
 	int8_t target, nh, n;
 	uint8_t pval_min, pval_eoesep;
 
-	n = arg->solution_moves->nmoves + arg->solution_moves->npremoves;
-	target = arg->target_depth - n;
-	if (target <= 0 ||
-	    arg->solution_list->nsols >= arg->solution_settings->maxsolutions ||
-	    n > arg->solution_list->shortest_sol +
-	        arg->solution_settings->optimal)
-		return true;
-
 	arg->movemask_normal = arg->movemask_inverse = MM18_ALLMOVES;
 	arg->nodes_visited++;
 
 	/* Preliminary probing using last computed bound, if possible */
 
+	n = arg->solution_moves->nmoves + arg->solution_moves->npremoves;
+	target = arg->target_depth - n;
 	if ((arg->use_lb_normal && arg->lb_normal > target) ||
 	    (arg->use_lb_inverse && arg->lb_inverse > target))
 		return true;
@@ -200,14 +194,13 @@ STATIC int64_t
 solve_h48_dfs(dfsarg_solve_h48_t arg[static 1])
 {
 	int64_t ret, n;
-	uint8_t m, nm, lbn, lbi;
+	uint8_t m, nm, lbn, lbi, t;
 	uint64_t mm_normal, mm_inverse;
 	bool ulbi, ulbn;
 	cube_t backup_cube, backup_inverse;
 
+	nm = arg->solution_moves->nmoves + arg->solution_moves->npremoves;
 	if (equal(arg->cube, SOLVED_CUBE)) {
-		nm = arg->solution_moves->nmoves
-		    + arg->solution_moves->npremoves;
 		if (arg->target_depth != nm)
 			return 0;
 		wrapthread_mutex_lock(arg->solutions_mutex);
@@ -220,6 +213,11 @@ solve_h48_dfs(dfsarg_solve_h48_t arg[static 1])
 	if (solve_h48_stop(arg))
 		return 0;
 
+	t = arg->solution_list->shortest_sol + arg->solution_settings->optimal;
+	if (nm + 1 > MIN(t, arg->target_depth) ||
+	    arg->solution_list->nsols >= arg->solution_settings->maxsolutions)
+		return 0;
+
 	backup_cube = arg->cube;
 	backup_inverse = arg->inverse;
 	lbn = arg->lb_normal;