diff options
Diffstat (limited to 'src/commands.c')
| -rw-r--r-- | src/commands.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/commands.c b/src/commands.c index 9ac1ae6..a9e8fc9 100644 --- a/src/commands.c +++ b/src/commands.c | |||
| @@ -215,10 +215,21 @@ solve_exec(CommandArgs *args) | |||
| 215 | { | 215 | { |
| 216 | Cube c; | 216 | Cube c; |
| 217 | AlgList *sols; | 217 | AlgList *sols; |
| 218 | Solver *solver[99]; | ||
| 219 | Threader *threader; | ||
| 218 | 220 | ||
| 219 | make_solved(&c); | 221 | make_solved(&c); |
| 220 | apply_alg(args->scramble, &c); | 222 | apply_alg(args->scramble, &c); |
| 221 | sols = solve(&c, args->cs, args->opts); | 223 | /* TODO: adjust */ |
| 224 | /* threader = &threader_single;*/ | ||
| 225 | threader = &threader_eager; | ||
| 226 | |||
| 227 | /* TODO: adjust */ | ||
| 228 | int i; | ||
| 229 | for (i = 0; args->cs->step[i] != NULL; i++) | ||
| 230 | solver[i] = new_stepsolver_lazy(args->cs->step[i]); | ||
| 231 | solver[i] = NULL; | ||
| 232 | sols = solve(&c, args->opts, solver, threader); | ||
| 222 | 233 | ||
| 223 | if (args->opts->count_only) | 234 | if (args->opts->count_only) |
| 224 | printf("%d\n", sols->len); | 235 | printf("%d\n", sols->len); |
| @@ -285,7 +296,10 @@ scramble_exec(CommandArgs *args) | |||
| 285 | } | 296 | } |
| 286 | 297 | ||
| 287 | /* TODO: can be optimized for htr and dr using htrfin, drfin */ | 298 | /* TODO: can be optimized for htr and dr using htrfin, drfin */ |
| 299 | /* | ||
| 300 | TODO: solve_2phase was removed | ||
| 288 | scr = solve_2phase(&cube, 1); | 301 | scr = solve_2phase(&cube, 1); |
| 302 | */ | ||
| 289 | 303 | ||
| 290 | if (!strcmp(args->scrtype, "fmc")) { | 304 | if (!strcmp(args->scrtype, "fmc")) { |
| 291 | aux = new_alg(""); | 305 | aux = new_alg(""); |
| @@ -383,6 +397,7 @@ print_exec(CommandArgs *args) | |||
| 383 | print_cube(&c); | 397 | print_cube(&c); |
| 384 | } | 398 | } |
| 385 | 399 | ||
| 400 | /* | ||
| 386 | void | 401 | void |
| 387 | twophase_exec(CommandArgs *args) | 402 | twophase_exec(CommandArgs *args) |
| 388 | { | 403 | { |
| @@ -396,6 +411,7 @@ twophase_exec(CommandArgs *args) | |||
| 396 | print_alg(sol, false); | 411 | print_alg(sol, false); |
| 397 | free_alg(sol); | 412 | free_alg(sol); |
| 398 | } | 413 | } |
| 414 | */ | ||
| 399 | 415 | ||
| 400 | void | 416 | void |
| 401 | help_exec(CommandArgs *args) | 417 | help_exec(CommandArgs *args) |
