diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2022-02-25 17:40:40 +0100 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2022-02-25 17:40:40 +0100 |
| commit | 891af301fbc5c7de834841dc2adecc63f2af6be5 (patch) | |
| tree | 703fab54bfeb34f6839d4a03d5ca310d2f3b109f | |
| parent | 06c3b9610b7694db34ee91312d8f3aa2196d7d62 (diff) | |
| download | nissy-891af301fbc5c7de834841dc2adecc63f2af6be5.tar.gz nissy-891af301fbc5c7de834841dc2adecc63f2af6be5.zip | |
Removed possible cancellable moves from 2phase solver
| -rw-r--r-- | TODO.md | 3 | ||||
| -rw-r--r-- | src/solve.c | 7 |
2 files changed, 5 insertions, 5 deletions
| @@ -5,8 +5,6 @@ It's more of a personal reminder than anything else. | |||
| 5 | 5 | ||
| 6 | ## For version 2.1 | 6 | ## For version 2.1 |
| 7 | ### Scrambles | 7 | ### Scrambles |
| 8 | * Better two-phase solver, make sure to not have cancelling moves | ||
| 9 | (possibly use cleanup function) | ||
| 10 | * dr and htr scrambles | 8 | * dr and htr scrambles |
| 11 | * rufify | 9 | * rufify |
| 12 | ### Memory management | 10 | ### Memory management |
| @@ -45,7 +43,6 @@ including e.g. solutions that were not shown because -c) | |||
| 45 | * silent batch mode without >>> | 43 | * silent batch mode without >>> |
| 46 | 44 | ||
| 47 | ### New features | 45 | ### New features |
| 48 | * cleanup: translate an alg to the standard HTM moveset + reorient at the end | ||
| 49 | * configurability: add an `alias` command, run config file at startup | 46 | * configurability: add an `alias` command, run config file at startup |
| 50 | * configure max ram to be used (via config file and/or command line option) | 47 | * configure max ram to be used (via config file and/or command line option) |
| 51 | * transform alg, rufify etc... | 48 | * transform alg, rufify etc... |
diff --git a/src/solve.c b/src/solve.c index b9f5000..915c909 100644 --- a/src/solve.c +++ b/src/solve.c | |||
| @@ -444,7 +444,7 @@ Alg * | |||
| 444 | solve_2phase(Cube cube, int nthreads) | 444 | solve_2phase(Cube cube, int nthreads) |
| 445 | { | 445 | { |
| 446 | int bestlen, newb; | 446 | int bestlen, newb; |
| 447 | Alg *bestalg; | 447 | Alg *bestalg, *ret; |
| 448 | AlgList *sols1, *sols2; | 448 | AlgList *sols1, *sols2; |
| 449 | AlgListNode *i; | 449 | AlgListNode *i; |
| 450 | Cube c; | 450 | Cube c; |
| @@ -487,5 +487,8 @@ solve_2phase(Cube cube, int nthreads) | |||
| 487 | 487 | ||
| 488 | free_alglist(sols1); | 488 | free_alglist(sols1); |
| 489 | 489 | ||
| 490 | return bestalg; | 490 | ret = cleanup(bestalg); |
| 491 | free_alg(bestalg); | ||
| 492 | |||
| 493 | return ret; | ||
| 491 | } | 494 | } |
