nissy

commit 1b491232f8f5c2608ea8976a565392adad409895
parent f45094762590ca44f2aa80286b2ab016e513e142
Author: Sebastiano Tronto <sebastiano.tronto@gmail.com>
Date:   Fri, 24 Dec 2021 17:54:54 +0100

added some optimal-after-EO steps

Diffstat:
M
nissy
 | 
0

M
src/steps.c
 | 
63
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

2 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/nissy b/nissy
Binary files differ.
diff --git a/src/steps.c b/src/steps.c
@@ -121,6 +121,27 @@ optimal_light_HTM = {
 	.ntables   = 2,
 };
 
+/* Optimal after EO ******************/
+
+Step
+eofin_eo = {
+	.shortname = "eofin",
+	.name      = "Optimal solve after EO without breaking EO (detected)",
+
+	.final     = true,
+	.is_done   = is_solved,
+	.estimate  = estimate_nxopt31_HTM,
+	.ready     = check_eofb,
+	.ready_msg = check_eo_msg,
+	.is_valid  = always_valid,
+	.moveset   = &moveset_eofb,
+
+	.detect    = detect_pretrans_eofb,
+
+	.tables    = {&pd_nxopt31_HTM, &pd_corners_HTM},
+	.ntables   = 2,
+};
+
 Step
 eofbfin_eofb = {
 	.shortname = "eofbfin",
@@ -140,6 +161,44 @@ eofbfin_eofb = {
 	.ntables   = 2,
 };
 
+Step
+eorlfin_eorl = {
+	.shortname = "eorlfin",
+	.name      = "Optimal after EO on R/L without breaking EO",
+
+	.final     = true,
+	.is_done   = is_solved,
+	.estimate  = estimate_nxopt31_HTM,
+	.ready     = check_eofb,
+	.ready_msg = check_eo_msg,
+	.is_valid  = always_valid,
+	.moveset   = &moveset_eofb,
+
+	.pre_trans = ur,
+
+	.tables    = {&pd_nxopt31_HTM, &pd_corners_HTM},
+	.ntables   = 2,
+};
+
+Step
+eoudfin_eoud = {
+	.shortname = "eoudfin",
+	.name      = "Optimal after EO on U/D without breaking EO",
+
+	.final     = true,
+	.is_done   = is_solved,
+	.estimate  = estimate_nxopt31_HTM,
+	.ready     = check_eofb,
+	.ready_msg = check_eo_msg,
+	.is_valid  = always_valid,
+	.moveset   = &moveset_eofb,
+
+	.pre_trans = fd,
+
+	.tables    = {&pd_nxopt31_HTM, &pd_corners_HTM},
+	.ntables   = 2,
+};
+
 /* EO steps **************************/
 Step
 eoany_HTM = {
@@ -880,7 +939,11 @@ htrfin_htr = {
 Step *steps[NSTEPS] = {
 	&optimal_HTM, /* first is default */
 	&optimal_light_HTM,
+
+	&eofin_eo,
 	&eofbfin_eofb,
+	&eorlfin_eorl,
+	&eoudfin_eoud,
 
 	&eoany_HTM,
 	&eofb_HTM,