From 214ef0fe87b48e044681bb831b8ae2fc2fe1a35b Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Sun, 24 Sep 2023 18:03:44 +0200 Subject: Added -L option --- src/solve.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/solve.c') diff --git a/src/solve.c b/src/solve.c index 44550cc..39437fb 100644 --- a/src/solve.c +++ b/src/solve.c @@ -97,7 +97,7 @@ dfs(DfsArg *arg) invert_branch(arg); dfs_branch(arg); - if (arg->opts->can_niss && !arg->niss && niss_makes_sense(arg)) + if (arg->opts->nisstype == NISS && !arg->niss && niss_makes_sense(arg)) dfs_niss(arg); if (sw) @@ -193,7 +193,7 @@ dfs_stop(DfsArg *arg) bool b; lowerbound = arg->step->estimate(arg); - if (arg->opts->can_niss && !arg->niss) + if (arg->opts->nisstype == NISS && !arg->niss) lowerbound = MIN(1, lowerbound); if (arg->current_alg->len + lowerbound > arg->d) { @@ -330,7 +330,7 @@ multidfs(Cube c, Trans tr, Step *s, SolveOptions *opts, AlgList *sols, int d) alg = new_alg(""); append_move(alg, s->moveset->sorted_moves[i], false); append_alg(start, alg); - if (opts->can_niss) { + if (opts->nisstype == NISS || opts->nisstype == LINEAR) { alg->inv[0] = true; append_alg(start, alg); } @@ -458,7 +458,7 @@ solve_2phase(Cube cube, int nthreads) opts1.max_solutions = 20; opts1.nthreads = nthreads; opts1.optimal = 3; - opts1.can_niss = false; + opts1.nisstype = NORMAL; opts1.verbose = false; opts1.all = true; @@ -466,7 +466,7 @@ solve_2phase(Cube cube, int nthreads) opts2.max_moves = 19; opts2.max_solutions = 1; opts2.nthreads = nthreads; - opts2.can_niss = false; + opts2.nisstype = NORMAL; opts2.verbose = false; /* We skip step1 if it is solved on any axis */ -- cgit v1.3