diff options
Diffstat (limited to '')
| -rw-r--r-- | shell/shell.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/shell/shell.c b/shell/shell.c index 2853350..2a1a8cd 100644 --- a/shell/shell.c +++ b/shell/shell.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #define FLAG_PERM "-perm" | 17 | #define FLAG_PERM "-perm" |
| 18 | #define FLAG_COMMAND "-command" | 18 | #define FLAG_COMMAND "-command" |
| 19 | #define FLAG_STR_CUBE "-cubestr" | 19 | #define FLAG_STR_CUBE "-cubestr" |
| 20 | #define FLAG_SOLVE_OPTS "-options" | ||
| 21 | #define FLAG_FORMAT "-format" | 20 | #define FLAG_FORMAT "-format" |
| 22 | #define FLAG_FORMAT_IN "-fin" | 21 | #define FLAG_FORMAT_IN "-fin" |
| 23 | #define FLAG_FORMAT_OUT "-fout" | 22 | #define FLAG_FORMAT_OUT "-fout" |
| @@ -45,7 +44,6 @@ typedef struct { | |||
| 45 | char cube_perm[22]; | 44 | char cube_perm[22]; |
| 46 | char *str_command; | 45 | char *str_command; |
| 47 | char *str_cube; | 46 | char *str_cube; |
| 48 | char *str_options; | ||
| 49 | char *str_format; | 47 | char *str_format; |
| 50 | char *str_format_in; | 48 | char *str_format_in; |
| 51 | char *str_format_out; | 49 | char *str_format_out; |
| @@ -81,7 +79,6 @@ static bool set_cube(int, char **, args_t *); | |||
| 81 | static bool set_cube_perm(int, char **, args_t *); | 79 | static bool set_cube_perm(int, char **, args_t *); |
| 82 | static bool set_str_command(int, char **, args_t *); | 80 | static bool set_str_command(int, char **, args_t *); |
| 83 | static bool set_str_cube(int, char **, args_t *); | 81 | static bool set_str_cube(int, char **, args_t *); |
| 84 | static bool set_str_options(int, char **, args_t *); | ||
| 85 | static bool set_str_format(int, char **, args_t *); | 82 | static bool set_str_format(int, char **, args_t *); |
| 86 | static bool set_str_format_in(int, char **, args_t *); | 83 | static bool set_str_format_in(int, char **, args_t *); |
| 87 | static bool set_str_format_out(int, char **, args_t *); | 84 | static bool set_str_format_out(int, char **, args_t *); |
| @@ -108,7 +105,6 @@ struct { | |||
| 108 | OPTION(FLAG_PERM, 1, set_cube_perm), | 105 | OPTION(FLAG_PERM, 1, set_cube_perm), |
| 109 | OPTION(FLAG_COMMAND, 1, set_str_command), | 106 | OPTION(FLAG_COMMAND, 1, set_str_command), |
| 110 | OPTION(FLAG_STR_CUBE, 1, set_str_cube), | 107 | OPTION(FLAG_STR_CUBE, 1, set_str_cube), |
| 111 | OPTION(FLAG_SOLVE_OPTS, 1, set_str_options), | ||
| 112 | OPTION(FLAG_FORMAT, 1, set_str_format), | 108 | OPTION(FLAG_FORMAT, 1, set_str_format), |
| 113 | OPTION(FLAG_FORMAT_IN, 1, set_str_format_in), | 109 | OPTION(FLAG_FORMAT_IN, 1, set_str_format_in), |
| 114 | OPTION(FLAG_FORMAT_OUT, 1, set_str_format_out), | 110 | OPTION(FLAG_FORMAT_OUT, 1, set_str_format_out), |
| @@ -201,7 +197,6 @@ struct { | |||
| 201 | "solve", | 197 | "solve", |
| 202 | "solve " FLAG_SOLVER " SOLVER" | 198 | "solve " FLAG_SOLVER " SOLVER" |
| 203 | "[" FLAG_MINMOVES " n] [" FLAG_MAXMOVES " N] " | 199 | "[" FLAG_MINMOVES " n] [" FLAG_MAXMOVES " N] " |
| 204 | "[" FLAG_SOLVE_OPTS " options] " | ||
| 205 | FLAG_CUBE " CUBE" | 200 | FLAG_CUBE " CUBE" |
| 206 | FLAG_THREADS " T", | 201 | FLAG_THREADS " T", |
| 207 | "Solve the given CUBE using SOLVER, " | 202 | "Solve the given CUBE using SOLVER, " |
| @@ -213,7 +208,6 @@ struct { | |||
| 213 | "solve_scramble", | 208 | "solve_scramble", |
| 214 | "solve_scramble " FLAG_SOLVER " SOLVER" | 209 | "solve_scramble " FLAG_SOLVER " SOLVER" |
| 215 | "[" FLAG_MINMOVES " n] [" FLAG_MAXMOVES " N] " | 210 | "[" FLAG_MINMOVES " n] [" FLAG_MAXMOVES " N] " |
| 216 | "[" FLAG_SOLVE_OPTS " options] " | ||
| 217 | FLAG_MOVES " MOVES", | 211 | FLAG_MOVES " MOVES", |
| 218 | "Solve the given SCRAMBLE using SOLVER, " | 212 | "Solve the given SCRAMBLE using SOLVER, " |
| 219 | "using at least n and at most N moves. " | 213 | "using at least n and at most N moves. " |
| @@ -485,9 +479,9 @@ solve_exec(args_t *args) | |||
| 485 | } | 479 | } |
| 486 | 480 | ||
| 487 | ret = nissy_solve( | 481 | ret = nissy_solve( |
| 488 | args->cube, args->str_solver, args->str_options, nissflag, | 482 | args->cube, args->str_solver, nissflag, args->minmoves, |
| 489 | args->minmoves, args->maxmoves, args->maxsolutions, args->optimal, | 483 | args->maxmoves, args->maxsolutions, args->optimal, args->threads, |
| 490 | args->threads, size, buf, SOLUTIONS_BUFFER_SIZE, solutions, stats); | 484 | size, buf, SOLUTIONS_BUFFER_SIZE, solutions, stats); |
| 491 | 485 | ||
| 492 | free(buf); | 486 | free(buf); |
| 493 | 487 | ||
| @@ -665,14 +659,6 @@ set_str_cube(int argc, char **argv, args_t *args) | |||
| 665 | } | 659 | } |
| 666 | 660 | ||
| 667 | static bool | 661 | static bool |
| 668 | set_str_options(int argc, char **argv, args_t *args) | ||
| 669 | { | ||
| 670 | args->str_options = argv[0]; | ||
| 671 | |||
| 672 | return true; | ||
| 673 | } | ||
| 674 | |||
| 675 | static bool | ||
| 676 | set_str_format(int argc, char **argv, args_t *args) | 662 | set_str_format(int argc, char **argv, args_t *args) |
| 677 | { | 663 | { |
| 678 | args->str_format = argv[0]; | 664 | args->str_format = argv[0]; |
