diff options
| author | enricotenuti <tenutz_27@outlook.it> | 2024-08-29 19:28:13 +0200 |
|---|---|---|
| committer | enricotenuti <tenutz_27@outlook.it> | 2024-08-29 19:28:13 +0200 |
| commit | 0a45da13ca06f7884872160a6756a04d1eb849c5 (patch) | |
| tree | 18639a74fc21de9d954178ed0610327093ffadca /src/solvers | |
| parent | 47a65b676d1de889706517f05659f0bb659782c9 (diff) | |
| download | nissy-core-0a45da13ca06f7884872160a6756a04d1eb849c5.tar.gz nissy-core-0a45da13ca06f7884872160a6756a04d1eb849c5.zip | |
constants fix
Diffstat (limited to 'src/solvers')
| -rw-r--r-- | src/solvers/h48/solve.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h index 751df8f..ed06a85 100644 --- a/src/solvers/h48/solve.h +++ b/src/solvers/h48/solve.h | |||
| @@ -66,7 +66,7 @@ solve_h48_stop(dfsarg_solveh48_t *arg) | |||
| 66 | uint32_t data, data_inv; | 66 | uint32_t data, data_inv; |
| 67 | int8_t bound; | 67 | int8_t bound; |
| 68 | 68 | ||
| 69 | arg->nissbranch = NONISS; | 69 | arg->nissbranch = NORMAL; |
| 70 | bound = get_h48_cdata(arg->cube, arg->cocsepdata, &data); | 70 | bound = get_h48_cdata(arg->cube, arg->cocsepdata, &data); |
| 71 | if (bound + arg->nmoves + arg->npremoves > arg->depth) | 71 | if (bound + arg->nmoves + arg->npremoves > arg->depth) |
| 72 | return true; | 72 | return true; |
| @@ -86,7 +86,7 @@ solve_h48_stop(dfsarg_solveh48_t *arg) | |||
| 86 | if (bound + arg->nmoves + arg->npremoves > arg->depth) | 86 | if (bound + arg->nmoves + arg->npremoves > arg->depth) |
| 87 | return true; | 87 | return true; |
| 88 | if (bound + arg->nmoves + arg->npremoves == arg->depth) | 88 | if (bound + arg->nmoves + arg->npremoves == arg->depth) |
| 89 | arg->nissbranch = BRANCH; | 89 | arg->nissbranch = NORMALBRANCH; |
| 90 | 90 | ||
| 91 | return false; | 91 | return false; |
| 92 | } | 92 | } |
| @@ -115,7 +115,7 @@ solve_h48_dfs(dfsarg_solveh48_t *arg) | |||
| 115 | nextarg = *arg; | 115 | nextarg = *arg; |
| 116 | ret = 0; | 116 | ret = 0; |
| 117 | uint32_t allowed; | 117 | uint32_t allowed; |
| 118 | if(arg->nissbranch & 0x01) { | 118 | if(arg->nissbranch & INVERSE) { |
| 119 | allowed = allowednextmoveH48(arg->premoves, arg->npremoves, arg->nissbranch); | 119 | allowed = allowednextmoveH48(arg->premoves, arg->npremoves, arg->nissbranch); |
| 120 | for (m = 0; m < 18; m++) { | 120 | for (m = 0; m < 18; m++) { |
| 121 | if(allowed & (1 << m)) { | 121 | if(allowed & (1 << m)) { |
| @@ -139,7 +139,6 @@ solve_h48_dfs(dfsarg_solveh48_t *arg) | |||
| 139 | } | 139 | } |
| 140 | } | 140 | } |
| 141 | 141 | ||
| 142 | |||
| 143 | return ret; | 142 | return ret; |
| 144 | } | 143 | } |
| 145 | 144 | ||
