diff options
Diffstat (limited to '')
| -rw-r--r-- | src/nissy.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/nissy.c b/src/nissy.c index fb3cc11..8aa0334 100644 --- a/src/nissy.c +++ b/src/nissy.c | |||
| @@ -119,7 +119,7 @@ distribution_equal( | |||
| 119 | STATIC long long | 119 | STATIC long long |
| 120 | write_result(cube_t cube, char result[static NISSY_SIZE_CUBE]) | 120 | write_result(cube_t cube, char result[static NISSY_SIZE_CUBE]) |
| 121 | { | 121 | { |
| 122 | writecube("B32", cube, NISSY_SIZE_CUBE, result); | 122 | writecube(cube, NISSY_SIZE_CUBE, result); |
| 123 | 123 | ||
| 124 | if (!issolvable(cube)) { | 124 | if (!issolvable(cube)) { |
| 125 | LOG("Warning: resulting cube is not solvable\n"); | 125 | LOG("Warning: resulting cube is not solvable\n"); |
| @@ -151,7 +151,7 @@ nissy_compose( | |||
| 151 | cube_t c, p, res; | 151 | cube_t c, p, res; |
| 152 | long long err; | 152 | long long err; |
| 153 | 153 | ||
| 154 | c = readcube("B32", cube); | 154 | c = readcube(cube); |
| 155 | 155 | ||
| 156 | if (!isconsistent(c)) { | 156 | if (!isconsistent(c)) { |
| 157 | LOG("[compose] Error: the given cube is invalid\n"); | 157 | LOG("[compose] Error: the given cube is invalid\n"); |
| @@ -159,7 +159,7 @@ nissy_compose( | |||
| 159 | goto nissy_compose_error; | 159 | goto nissy_compose_error; |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | p = readcube("B32", permutation); | 162 | p = readcube(permutation); |
| 163 | 163 | ||
| 164 | if (!isconsistent(p)) { | 164 | if (!isconsistent(p)) { |
| 165 | LOG("[compose] Error: given permutation is invalid\n"); | 165 | LOG("[compose] Error: given permutation is invalid\n"); |
| @@ -178,7 +178,7 @@ nissy_compose( | |||
| 178 | return write_result(res, result); | 178 | return write_result(res, result); |
| 179 | 179 | ||
| 180 | nissy_compose_error: | 180 | nissy_compose_error: |
| 181 | writecube("B32", ZERO_CUBE, NISSY_SIZE_CUBE, result); | 181 | writecube(ZERO_CUBE, NISSY_SIZE_CUBE, result); |
| 182 | return err; | 182 | return err; |
| 183 | } | 183 | } |
| 184 | 184 | ||
| @@ -191,7 +191,7 @@ nissy_inverse( | |||
| 191 | cube_t c, res; | 191 | cube_t c, res; |
| 192 | long long err; | 192 | long long err; |
| 193 | 193 | ||
| 194 | c = readcube("B32", cube); | 194 | c = readcube(cube); |
| 195 | 195 | ||
| 196 | if (iserror(c)) { | 196 | if (iserror(c)) { |
| 197 | LOG("[inverse] Error: the given cube is invalid\n"); | 197 | LOG("[inverse] Error: the given cube is invalid\n"); |
| @@ -210,7 +210,7 @@ nissy_inverse( | |||
| 210 | return write_result(res, result); | 210 | return write_result(res, result); |
| 211 | 211 | ||
| 212 | nissy_inverse_error: | 212 | nissy_inverse_error: |
| 213 | writecube("B32", ZERO_CUBE, NISSY_SIZE_CUBE, result); | 213 | writecube(ZERO_CUBE, NISSY_SIZE_CUBE, result); |
| 214 | return err; | 214 | return err; |
| 215 | } | 215 | } |
| 216 | 216 | ||
| @@ -230,7 +230,7 @@ nissy_applymoves( | |||
| 230 | goto nissy_applymoves_error; | 230 | goto nissy_applymoves_error; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | c = readcube("B32", cube); | 233 | c = readcube(cube); |
| 234 | 234 | ||
| 235 | if (!isconsistent(c)) { | 235 | if (!isconsistent(c)) { |
| 236 | LOG("[applymoves] Error: given cube is invalid\n"); | 236 | LOG("[applymoves] Error: given cube is invalid\n"); |
| @@ -249,7 +249,7 @@ nissy_applymoves( | |||
| 249 | return write_result(res, result); | 249 | return write_result(res, result); |
| 250 | 250 | ||
| 251 | nissy_applymoves_error: | 251 | nissy_applymoves_error: |
| 252 | writecube("B32", ZERO_CUBE, NISSY_SIZE_CUBE, result); | 252 | writecube(ZERO_CUBE, NISSY_SIZE_CUBE, result); |
| 253 | return err; | 253 | return err; |
| 254 | } | 254 | } |
| 255 | 255 | ||
| @@ -263,7 +263,7 @@ nissy_applytrans( | |||
| 263 | cube_t c, res; | 263 | cube_t c, res; |
| 264 | long long err; | 264 | long long err; |
| 265 | 265 | ||
| 266 | c = readcube("B32", cube); | 266 | c = readcube(cube); |
| 267 | 267 | ||
| 268 | if (!isconsistent(c)) { | 268 | if (!isconsistent(c)) { |
| 269 | LOG("[applytrans] Error: given cube is invalid\n"); | 269 | LOG("[applytrans] Error: given cube is invalid\n"); |
| @@ -282,7 +282,7 @@ nissy_applytrans( | |||
| 282 | return write_result(res, result); | 282 | return write_result(res, result); |
| 283 | 283 | ||
| 284 | nissy_applytrans_error: | 284 | nissy_applytrans_error: |
| 285 | writecube("B32", ZERO_CUBE, NISSY_SIZE_CUBE, result); | 285 | writecube(ZERO_CUBE, NISSY_SIZE_CUBE, result); |
| 286 | return err; | 286 | return err; |
| 287 | } | 287 | } |
| 288 | 288 | ||
| @@ -507,7 +507,7 @@ nissy_solve( | |||
| 507 | return NISSY_ERROR_NULL_POINTER; | 507 | return NISSY_ERROR_NULL_POINTER; |
| 508 | } | 508 | } |
| 509 | 509 | ||
| 510 | c = readcube_B32(cube); | 510 | c = readcube(cube); |
| 511 | 511 | ||
| 512 | if (!isconsistent(c)) { | 512 | if (!isconsistent(c)) { |
| 513 | LOG("[solve] Error: cube is invalid\n"); | 513 | LOG("[solve] Error: cube is invalid\n"); |
