diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2023-09-24 18:03:44 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2023-09-24 18:03:44 +0200 |
| commit | 214ef0fe87b48e044681bb831b8ae2fc2fe1a35b (patch) | |
| tree | 1dc657cd93d9c208bdee41b44f2f32b651177523 /src/solve.c | |
| parent | db4d88428a1bf20652f11d4cf9b31b7114fdacfb (diff) | |
| download | nissy-classic-214ef0fe87b48e044681bb831b8ae2fc2fe1a35b.tar.gz nissy-classic-214ef0fe87b48e044681bb831b8ae2fc2fe1a35b.zip | |
Added -L option
Diffstat (limited to '')
| -rw-r--r-- | src/solve.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) | |||
| 97 | invert_branch(arg); | 97 | invert_branch(arg); |
| 98 | dfs_branch(arg); | 98 | dfs_branch(arg); |
| 99 | 99 | ||
| 100 | if (arg->opts->can_niss && !arg->niss && niss_makes_sense(arg)) | 100 | if (arg->opts->nisstype == NISS && !arg->niss && niss_makes_sense(arg)) |
| 101 | dfs_niss(arg); | 101 | dfs_niss(arg); |
| 102 | 102 | ||
| 103 | if (sw) | 103 | if (sw) |
| @@ -193,7 +193,7 @@ dfs_stop(DfsArg *arg) | |||
| 193 | bool b; | 193 | bool b; |
| 194 | 194 | ||
| 195 | lowerbound = arg->step->estimate(arg); | 195 | lowerbound = arg->step->estimate(arg); |
| 196 | if (arg->opts->can_niss && !arg->niss) | 196 | if (arg->opts->nisstype == NISS && !arg->niss) |
| 197 | lowerbound = MIN(1, lowerbound); | 197 | lowerbound = MIN(1, lowerbound); |
| 198 | 198 | ||
| 199 | if (arg->current_alg->len + lowerbound > arg->d) { | 199 | 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) | |||
| 330 | alg = new_alg(""); | 330 | alg = new_alg(""); |
| 331 | append_move(alg, s->moveset->sorted_moves[i], false); | 331 | append_move(alg, s->moveset->sorted_moves[i], false); |
| 332 | append_alg(start, alg); | 332 | append_alg(start, alg); |
| 333 | if (opts->can_niss) { | 333 | if (opts->nisstype == NISS || opts->nisstype == LINEAR) { |
| 334 | alg->inv[0] = true; | 334 | alg->inv[0] = true; |
| 335 | append_alg(start, alg); | 335 | append_alg(start, alg); |
| 336 | } | 336 | } |
| @@ -458,7 +458,7 @@ solve_2phase(Cube cube, int nthreads) | |||
| 458 | opts1.max_solutions = 20; | 458 | opts1.max_solutions = 20; |
| 459 | opts1.nthreads = nthreads; | 459 | opts1.nthreads = nthreads; |
| 460 | opts1.optimal = 3; | 460 | opts1.optimal = 3; |
| 461 | opts1.can_niss = false; | 461 | opts1.nisstype = NORMAL; |
| 462 | opts1.verbose = false; | 462 | opts1.verbose = false; |
| 463 | opts1.all = true; | 463 | opts1.all = true; |
| 464 | 464 | ||
| @@ -466,7 +466,7 @@ solve_2phase(Cube cube, int nthreads) | |||
| 466 | opts2.max_moves = 19; | 466 | opts2.max_moves = 19; |
| 467 | opts2.max_solutions = 1; | 467 | opts2.max_solutions = 1; |
| 468 | opts2.nthreads = nthreads; | 468 | opts2.nthreads = nthreads; |
| 469 | opts2.can_niss = false; | 469 | opts2.nisstype = NORMAL; |
| 470 | opts2.verbose = false; | 470 | opts2.verbose = false; |
| 471 | 471 | ||
| 472 | /* We skip step1 if it is solved on any axis */ | 472 | /* We skip step1 if it is solved on any axis */ |
