diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nissy.c | 7 | ||||
| -rw-r--r-- | src/solvers/h48/gendata_h48.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/nissy.c b/src/nissy.c index 71b8ca3..6f5c37e 100644 --- a/src/nissy.c +++ b/src/nissy.c | |||
| @@ -217,13 +217,10 @@ nissy_datainfo( | |||
| 217 | switch (info.type) { | 217 | switch (info.type) { |
| 218 | case TABLETYPE_PRUNING: | 218 | case TABLETYPE_PRUNING: |
| 219 | write("\n"); | 219 | write("\n"); |
| 220 | write("Table distribution"); | 220 | write("Table distribution:\nValue\tPositions\n"); |
| 221 | if (info.base != 0) | ||
| 222 | write(" (base value = %" PRIu8 ")", info.base); | ||
| 223 | write(":\nValue\tPositions\n"); | ||
| 224 | for (i = 0; i <= info.maxvalue; i++) { | 221 | for (i = 0; i <= info.maxvalue; i++) { |
| 225 | write("%" PRIu8 "\t%" PRIu64 "\n", | 222 | write("%" PRIu8 "\t%" PRIu64 "\n", |
| 226 | i, info.distribution[i]); | 223 | i + info.base, info.distribution[i]); |
| 227 | } | 224 | } |
| 228 | break; | 225 | break; |
| 229 | case TABLETYPE_SPECIAL: | 226 | case TABLETYPE_SPECIAL: |
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h index 066c650..135d9d2 100644 --- a/src/solvers/h48/gendata_h48.h +++ b/src/solvers/h48/gendata_h48.h | |||
| @@ -197,8 +197,10 @@ gendata_h48h0k4(gendata_h48_arg_t *arg) | |||
| 197 | .hash = 0, /* TODO */ | 197 | .hash = 0, /* TODO */ |
| 198 | .entries = H48_COORDMAX(0), | 198 | .entries = H48_COORDMAX(0), |
| 199 | .classes = 0, | 199 | .classes = 0, |
| 200 | .h48h = 0, | ||
| 200 | .bits = 4, | 201 | .bits = 4, |
| 201 | .base = 0, | 202 | .base = 0, |
| 203 | .maxvalue = 0, | ||
| 202 | .next = 0, | 204 | .next = 0, |
| 203 | }; | 205 | }; |
| 204 | 206 | ||
| @@ -364,14 +366,17 @@ gendata_h48k2(gendata_h48_arg_t *arg) | |||
| 364 | 366 | ||
| 365 | selectedbase = base[arg->h]; | 367 | selectedbase = base[arg->h]; |
| 366 | arg->info = (tableinfo_t) { | 368 | arg->info = (tableinfo_t) { |
| 367 | .solver = "h48 solver h = , k = 4", | 369 | .solver = "h48 solver h = , k = 2", |
| 368 | .type = TABLETYPE_PRUNING, | 370 | .type = TABLETYPE_PRUNING, |
| 369 | .infosize = INFOSIZE, | 371 | .infosize = INFOSIZE, |
| 370 | .fullsize = H48_TABLESIZE(arg->h, 2) + INFOSIZE, | 372 | .fullsize = H48_TABLESIZE(arg->h, 2) + INFOSIZE, |
| 371 | .hash = 0, /* TODO */ | 373 | .hash = 0, /* TODO */ |
| 372 | .entries = H48_COORDMAX(arg->h), | 374 | .entries = H48_COORDMAX(arg->h), |
| 375 | .classes = 0, | ||
| 376 | .h48h = arg->h, | ||
| 373 | .bits = 2, | 377 | .bits = 2, |
| 374 | .base = selectedbase, | 378 | .base = selectedbase, |
| 379 | .maxvalue = 3, | ||
| 375 | .next = 0, | 380 | .next = 0, |
| 376 | }; | 381 | }; |
| 377 | arg->info.solver[15] = (arg->h % 10) + '0'; | 382 | arg->info.solver[15] = (arg->h % 10) + '0'; |
