nissy-fmc

commit 891af301fbc5c7de834841dc2adecc63f2af6be5
parent 06c3b9610b7694db34ee91312d8f3aa2196d7d62
Author: Sebastiano Tronto <sebastiano@tronto.net>
Date:   Fri, 25 Feb 2022 17:40:40 +0100

Removed possible cancellable moves from 2phase solver

Diffstat:
M
TODO.md
 | 
3
---
M
src/solve.c
 | 
7
+++++--

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/TODO.md b/TODO.md
@@ -5,8 +5,6 @@ It's more of a personal reminder than anything else.
 
 ## For version 2.1
 ### Scrambles
-* Better two-phase solver, make sure to not have cancelling moves
-  (possibly use cleanup function)
 * dr and htr scrambles
 * rufify
 ### Memory management
@@ -45,7 +43,6 @@ including e.g. solutions that were not shown because -c)
 * silent batch mode without >>>
 
 ### New features
-* cleanup: translate an alg to the standard HTM moveset + reorient at the end
 * configurability: add an `alias` command, run config file at startup
 * configure max ram to be used (via config file and/or command line option)
 * transform alg, rufify etc...
diff --git a/src/solve.c b/src/solve.c
@@ -444,7 +444,7 @@ Alg *
 solve_2phase(Cube cube, int nthreads)
 {
 	int bestlen, newb;
-	Alg *bestalg;
+	Alg *bestalg, *ret;
 	AlgList *sols1, *sols2;
 	AlgListNode *i;
 	Cube c;
@@ -487,5 +487,8 @@ solve_2phase(Cube cube, int nthreads)
 
 	free_alglist(sols1);
 
-	return bestalg;
+	ret = cleanup(bestalg);
+	free_alg(bestalg);
+
+	return ret;
 }