diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2024-10-10 14:30:39 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2024-10-10 14:30:39 +0200 |
| commit | f8d247c53c3c3bd94fed645b5b47a9096cadc123 (patch) | |
| tree | 7a62cc7322ea8175a7df9b655d4a9d5e026a004a /src/nissy.h | |
| parent | 2e93de4ad102973961cb24d5b91f0c299763299f (diff) | |
| download | nissy-core-f8d247c53c3c3bd94fed645b5b47a9096cadc123.tar.gz nissy-core-f8d247c53c3c3bd94fed645b5b47a9096cadc123.zip | |
Removed "options" from solver selection
Now the solver name fully determines the solver (and options)
to be used. For example, now one must specify "h48h0k4" as the
name of the solver.
This PR also fixes a couple of things in tools.
Diffstat (limited to 'src/nissy.h')
| -rw-r--r-- | src/nissy.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nissy.h b/src/nissy.h index 0545556..1fc1776 100644 --- a/src/nissy.h +++ b/src/nissy.h | |||
| @@ -75,14 +75,12 @@ the same parameters, or -1 in case of error. The returned value can be | |||
| 75 | slightly larger than the actual table size. | 75 | slightly larger than the actual table size. |
| 76 | */ | 76 | */ |
| 77 | int64_t nissy_datasize( | 77 | int64_t nissy_datasize( |
| 78 | const char *solver, | 78 | const char *solver |
| 79 | const char *options /* TODO: remove options, use only solver name */ | ||
| 80 | ); | 79 | ); |
| 81 | 80 | ||
| 82 | /* Returns the number of bytes written, or -1 in case of error */ | 81 | /* Returns the number of bytes written, or -1 in case of error */ |
| 83 | int64_t nissy_gendata( | 82 | int64_t nissy_gendata( |
| 84 | const char *solver, | 83 | const char *solver, |
| 85 | const char *options, /* TODO: remove options, use only solver name */ | ||
| 86 | void *generated_data | 84 | void *generated_data |
| 87 | ); | 85 | ); |
| 88 | 86 | ||
| @@ -93,9 +91,9 @@ int64_t nissy_derivedata( | |||
| 93 | void *generated_data | 91 | void *generated_data |
| 94 | ); | 92 | ); |
| 95 | 93 | ||
| 94 | /* Returns 0 on positive check, 1 on error */ | ||
| 96 | int64_t nissy_checkdata( | 95 | int64_t nissy_checkdata( |
| 97 | const char *solver, | 96 | const char *solver, |
| 98 | const char *options, | ||
| 99 | const void *data | 97 | const void *data |
| 100 | ); | 98 | ); |
| 101 | 99 | ||
| @@ -109,7 +107,6 @@ int64_t nissy_datainfo( | |||
| 109 | int64_t nissy_solve( | 107 | int64_t nissy_solve( |
| 110 | const char cube[static 22], | 108 | const char cube[static 22], |
| 111 | const char *solver, | 109 | const char *solver, |
| 112 | const char *options, /* TODO: remove options, use only solver name */ | ||
| 113 | const char *nisstype, /* TODO: remove, use flags */ | 110 | const char *nisstype, /* TODO: remove, use flags */ |
| 114 | int8_t minmoves, | 111 | int8_t minmoves, |
| 115 | int8_t maxmoves, | 112 | int8_t maxmoves, |
