1 files changed, 55 insertions, 89 deletions

diff --git a/src/steps.h b/src/steps.h
index 341be98..0511b27 100644
--- a/src/steps.h
+++ b/src/steps.h
@@ -13,9 +13,8 @@ bool                    check_cornershtr(Cube *cube);
 bool                    check_eofb(Cube *cube);
 bool                    check_drud(Cube *cube);
 bool                    check_htr(Cube *cube);
-void                    compute_ind(StepAlt *a, Cube *cube, Movable *ind);
-int                     estimate_stepalt(StepAlt *a, Movable *ind, int goal);
-void                    prepare_step(Step *step, SolveOptions *opts);
+void                    compute_ind(Step *a, Cube *cube, Movable *ind);
+void                    prepare_cs(ChoiceStep *cs, SolveOptions *opts);
 bool                    always_valid(Alg *alg);
 bool                    validate_singlecw_ending(Alg *alg);
 
@@ -27,26 +26,25 @@ extern char check_dr_msg[100];
 extern char check_htr_msg[100];
 extern char check_drany_msg[100];
 
-extern StepAlt sa_nxopt31_HTM;
-extern StepAlt sa_eofb_HTM;
-extern StepAlt sa_drud_HTM;
-extern StepAlt sa_drfin_drud;
+extern Step step_eofb_HTM;
+extern Step step_drud_HTM;
+extern Step step_drfin_drud;
 
-extern Step optimal_HTM;
-extern Step eoany_HTM;
-extern Step eofb_HTM;
-extern Step eorl_HTM;
-extern Step eoud_HTM;
-extern Step drany_HTM;
-extern Step drud_HTM;
-extern Step drrl_HTM;
-extern Step drfb_HTM;
-extern Step dranyfin_DR;
-extern Step drudfin_drud;
-extern Step drrlfin_drrl;
-extern Step drfbfin_drfb;
+extern ChoiceStep optimal_HTM;
+extern ChoiceStep eoany_HTM;
+extern ChoiceStep eofb_HTM;
+extern ChoiceStep eorl_HTM;
+extern ChoiceStep eoud_HTM;
+extern ChoiceStep drany_HTM;
+extern ChoiceStep drud_HTM;
+extern ChoiceStep drrl_HTM;
+extern ChoiceStep drfb_HTM;
+extern ChoiceStep dranyfin_DR;
+extern ChoiceStep drudfin_drud;
+extern ChoiceStep drrlfin_drrl;
+extern ChoiceStep drfbfin_drfb;
 
-extern Step *steps[];
+extern ChoiceStep *csteps[];
 
 #else
 
@@ -56,83 +54,51 @@ char check_dr_msg[100]      = "DR must be solved on given axis";
 char check_htr_msg[100]     = "HTR must be solved";
 char check_drany_msg[100]   = "DR must be solved on at least one axis";
 
-/* Optimal solvers *******************/
-/* TODO: build options for smaller optimal solvers */
-
-StepAlt
-sa_nxopt31_HTM = {
-        .ready          = check_centers,
-        .final          = true,
-        .moveset        = &moveset_HTM,
-        .n_coord        = 6,
-        .coord          = {&coord_nxopt31, &coord_nxopt31, &coord_nxopt31,
-                           &coord_eposepe, &coord_eposepe, &coord_eposepe},
-                          /* TODO: use khuge as fallback? */
-        .coord_trans    = {uf, rd, bl, uf, rd, bl},
-        .compact_pd     = {true, true, true, false, false, false},
-        .fallback_coord = {&coord_drud_sym16, &coord_drud_sym16,
-                           &coord_drud_sym16},
-        .fbmod          = {BINOM8ON4, BINOM8ON4, BINOM8ON4},
-        .n_dbtrick      = 1, /* TODO: change to 2 when khuge */
-        .dbtrick        = {{0, 1, 2}},
-        .is_valid       = NULL,
-};
-Step
-optimal_HTM = {
-        .shortname = "optimal",
-        .name      = "Optimal solve (in HTM)",
-        .alt       = {&sa_nxopt31_HTM, NULL},
-        .t         = {uf},
-        .ready_msg = check_centers_msg,
-};
-
 /* Optimal after EO ******************/
 /* TODO: eofin_eo (generic), eofbfin_eofb, eorlfin_eorl, eoudfin_eoud */
 
 /* EO steps **************************/
 /* TODO: eoany_HTM (generic), eofb_HTM, eorl_HTM, eoud_HTM */
 
-StepAlt
-sa_eofb_HTM = {
+Step
+step_eofb_HTM = {
         .ready          = check_centers,
         .final          = false,
         .moveset        = &moveset_HTM,
         .n_coord        = 1,
         .coord          = {&coord_eofb},
         .coord_trans    = {uf},
-        .compact_pd     = {false},
-        .n_dbtrick      = 0,
         .is_valid       = validate_singlecw_ending,
 };
-Step
+ChoiceStep
 eoany_HTM = {
         .shortname = "eo",
         .name      = "EO on any axis",
-        .alt       = {&sa_eofb_HTM, &sa_eofb_HTM, &sa_eofb_HTM, NULL},
+        .step      = {&step_eofb_HTM, &step_eofb_HTM, &step_eofb_HTM, NULL},
         .t         = {uf, ur, fd},
         .ready_msg = check_centers_msg,
 };
-Step
+ChoiceStep
 eofb_HTM = {
         .shortname = "eofb",
         .name      = "EO on F/B",
-        .alt       = {&sa_eofb_HTM, NULL},
+        .step      = {&step_eofb_HTM, NULL},
         .t         = {uf},
         .ready_msg = check_centers_msg,
 };
-Step
+ChoiceStep
 eorl_HTM = {
         .shortname = "eorl",
         .name      = "EO on R/L",
-        .alt       = {&sa_eofb_HTM, NULL},
+        .step      = {&step_eofb_HTM, NULL},
         .t         = {ur},
         .ready_msg = check_centers_msg,
 };
-Step
+ChoiceStep
 eoud_HTM = {
         .shortname = "eoud",
         .name      = "EO on U/D",
-        .alt       = {&sa_eofb_HTM, NULL},
+        .step      = {&step_eofb_HTM, NULL},
         .t         = {fd},
         .ready_msg = check_centers_msg,
 };
@@ -150,93 +116,90 @@ eoud_HTM = {
 /* TODO: dr_eofb (generic), dr_eorl (generic), dr_eoud (generic) */
 /* TODO: drud_eofb, drrl_eofb, drud_eorl, drfb_eorl, drrl_eoud, drfb_eoud */
 
-StepAlt
-sa_drud_HTM = {
+Step
+step_drud_HTM = {
         .ready          = check_centers,
         .final          = false,
         .moveset        = &moveset_HTM,
         .n_coord        = 1,
         .coord          = {&coord_drud_sym16},
         .coord_trans    = {uf},
-        .compact_pd     = {false}, /* TODO: maybe compactify */
-        .n_dbtrick      = 0,
         .is_valid       = validate_singlecw_ending,
 };
-Step
+ChoiceStep
 drany_HTM = {
         .shortname = "dr",
         .name      = "DR on any axis",
-        .alt       = {&sa_drud_HTM, &sa_drud_HTM, &sa_drud_HTM, NULL},
+        .step      = {&step_drud_HTM, &step_drud_HTM, &step_drud_HTM, NULL},
         .t         = {uf, rf, fd},
         .ready_msg = check_centers_msg,
 };
-Step
+ChoiceStep
 drud_HTM = {
         .shortname = "drud",
         .name      = "DR on U/D",
-        .alt       = {&sa_drud_HTM, NULL},
+        .step      = {&step_drud_HTM, NULL},
         .t         = {uf},
         .ready_msg = check_centers_msg,
 };
-Step
+ChoiceStep
 drrl_HTM = {
         .shortname = "drrl",
         .name      = "DR on R/L",
-        .alt       = {&sa_drud_HTM, NULL},
+        .step      = {&step_drud_HTM, NULL},
         .t         = {rf},
         .ready_msg = check_centers_msg,
 };
-Step
+ChoiceStep
 drfb_HTM = {
         .shortname = "drfb",
         .name      = "DR on F/B",
-        .alt       = {&sa_drud_HTM, NULL},
+        .step      = {&step_drud_HTM, NULL},
         .t         = {fd},
         .ready_msg = check_centers_msg,
 };
 
 /* DR finish steps */
-StepAlt
-sa_drfin_drud = {
+Step
+step_drfin_drud = {
         .ready          = check_drud,
         .final          = true,
         .moveset        = &moveset_drud,
         .n_coord        = 1,
         .coord          = {&coord_drudfin_noE_sym16}, /* TODO: maybe no noE */
         .coord_trans    = {uf},
-        .compact_pd     = {false}, /* TODO: maybe compactify */
-        .n_dbtrick      = 0,
         .is_valid       = NULL,
 };
-Step
+ChoiceStep
 dranyfin_DR = {
         .shortname = "drfin",
         .name      = "DR finish on any axis without breaking DR",
-        .alt       = {&sa_drfin_drud, &sa_drfin_drud, &sa_drfin_drud, NULL},
+        .step      = {&step_drfin_drud, &step_drfin_drud,
+                      &step_drfin_drud, NULL},
         .t         = {uf, rf, fd},
         .ready_msg = check_dr_msg,
 };
-Step
+ChoiceStep
 drudfin_drud = {
         .shortname = "drudfin",
         .name      = "DR finis on U/D without breaking DR",
-        .alt       = {&sa_drfin_drud, NULL},
+        .step      = {&step_drfin_drud, NULL},
         .t         = {uf},
         .ready_msg = check_dr_msg,
 };
-Step
+ChoiceStep
 drrlfin_drrl = {
         .shortname = "drrlfin",
         .name      = "DR finish on R/L without breaking DR",
-        .alt       = {&sa_drfin_drud, NULL},
+        .step      = {&step_drfin_drud, NULL},
         .t         = {rf},
         .ready_msg = check_dr_msg,
 };
-Step
+ChoiceStep
 drfbfin_drfb = {
         .shortname = "drfbfin",
         .name      = "DR finish on F/B without breaking DR",
-        .alt       = {&sa_drfin_drud, NULL},
+        .step      = {&step_drfin_drud, NULL},
         .t         = {fd},
         .ready_msg = check_dr_msg,
 };
@@ -247,13 +210,16 @@ drfbfin_drfb = {
 /* HTR finish */
 /* TODO: htrfin_htr */
 
-Step *steps[] = {
-        &optimal_HTM, /* first is default */
+ChoiceStep *csteps[] = {
+/* TODO: re-implement optimal
+        &optimal_HTM,
+*/
 
         &eoany_HTM, &eofb_HTM, &eorl_HTM, &eoud_HTM,
         &drany_HTM, &drud_HTM, &drrl_HTM, &drfb_HTM,
         &dranyfin_DR, &drudfin_drud, &drrlfin_drrl, &drfbfin_drfb,
 
+NULL
 /* TODO:
         &optimal_light_HTM,