aboutsummaryrefslogtreecommitdiff
path: root/src/solvers/h48
diff options
context:
space:
mode:
Diffstat (limited to 'src/solvers/h48')
-rw-r--r--src/solvers/h48/solve.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h
index d19309b..86c590a 100644
--- a/src/solvers/h48/solve.h
+++ b/src/solvers/h48/solve.h
@@ -52,8 +52,8 @@ STATIC int64_t solve_h48_maketasks(
52 solve_h48_task_t [static STARTING_CUBES], int [static 1]); 52 solve_h48_task_t [static STARTING_CUBES], int [static 1]);
53STATIC void *solve_h48_runthread(void *); 53STATIC void *solve_h48_runthread(void *);
54STATIC int64_t solve_h48_dfs(dfsarg_solve_h48_t [static 1]); 54STATIC int64_t solve_h48_dfs(dfsarg_solve_h48_t [static 1]);
55STATIC int64_t solve_h48(cube_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, 55STATIC int64_t solve_h48(oriented_cube_t, uint8_t, uint8_t, uint8_t, uint8_t,
56 uint64_t, const unsigned char *, size_t n, char [n], 56 uint8_t, uint64_t, const unsigned char *, size_t n, char [n],
57 long long [static NISSY_SIZE_SOLVE_STATS]); 57 long long [static NISSY_SIZE_SOLVE_STATS]);
58 58
59STATIC_INLINE bool 59STATIC_INLINE bool
@@ -342,7 +342,7 @@ solve_h48_maketasks(
342 342
343STATIC int64_t 343STATIC int64_t
344solve_h48( 344solve_h48(
345 cube_t cube, 345 oriented_cube_t oc,
346 uint8_t minmoves, 346 uint8_t minmoves,
347 uint8_t maxmoves, 347 uint8_t maxmoves,
348 uint8_t maxsolutions, 348 uint8_t maxsolutions,
@@ -407,17 +407,18 @@ solve_h48(
407 fallback2 = h48data + offset; 407 fallback2 = h48data + offset;
408 408
409 settings = (solution_settings_t) { 409 settings = (solution_settings_t) {
410 .tmask = symmetry_mask(cube), 410 .tmask = symmetry_mask(oc.cube),
411 .unniss = true, 411 .unniss = true,
412 .maxmoves = maxmoves, 412 .maxmoves = maxmoves,
413 .maxsolutions = maxsolutions, 413 .maxsolutions = maxsolutions,
414 .optimal = optimal, 414 .optimal = optimal,
415 .orientation = oc.orientation,
415 }; 416 };
416 417
417 for (i = 0; i < threads; i++) { 418 for (i = 0; i < threads; i++) {
418 arg[i] = (dfsarg_solve_h48_t) { 419 arg[i] = (dfsarg_solve_h48_t) {
419 .start_cube = cube, 420 .start_cube = oc.cube,
420 .cube = cube, 421 .cube = oc.cube,
421 .h = info.h48h, 422 .h = info.h48h,
422 .k = info.bits, 423 .k = info.bits,
423 .base = info.base, 424 .base = info.base,
@@ -441,7 +442,7 @@ solve_h48(
441 pthread_mutex_init(&solutions_mutex, NULL); 442 pthread_mutex_init(&solutions_mutex, NULL);
442 443
443 maketasks_arg = (dfsarg_solve_h48_maketasks_t) { 444 maketasks_arg = (dfsarg_solve_h48_maketasks_t) {
444 .cube = cube, 445 .cube = oc.cube,
445 .nmoves = 0, 446 .nmoves = 0,
446 .minmoves = minmoves, 447 .minmoves = minmoves,
447 .maxmoves = maxmoves, 448 .maxmoves = maxmoves,

Generated with cgit - Back to sebastiano.tronto.net