Refactor solver dispatch and checkdata

4 files changed, 4 insertions, 4 deletions

diff --git a/tools/000_gendata/gendata.c b/tools/000_gendata/gendata.c
index cd7fb0f..66c4864 100644
--- a/tools/000_gendata/gendata.c
+++ b/tools/000_gendata/gendata.c
@@ -49,7 +49,7 @@ int main(int argc, char **argv) {
         }
 
         solver = argv[1];
-        parse_h48_solver(solver, &h, &k);
+        parse_h48_hk(solver, &h, &k);
         expected = expected_h48[h][k];
 
         nissy_setlogger(log_stderr, NULL);
diff --git a/tools/expected_distributions.h b/tools/expected_distributions.h
index 12faf1d..1193fb3 100644
--- a/tools/expected_distributions.h
+++ b/tools/expected_distributions.h
@@ -160,7 +160,7 @@ uint64_t expected_dreo[21] = {
         [4] = 160,
         [5] = 1286,
         [6] = 8550,
-        [7] = 42512,
+        [7] = 42152,
         [8] = 90748,
         [9] = 33466,
         [10] = 757,
diff --git a/tools/nissy_extra.h b/tools/nissy_extra.h
index 8b27c3e..9a7df50 100644
--- a/tools/nissy_extra.h
+++ b/tools/nissy_extra.h
@@ -10,5 +10,5 @@ for testing purposes only.
 #include "../src/solvers/tables.h"
 
 size_t gendata_h48_derive(uint8_t, const unsigned char *, unsigned char *);
-long long parse_h48_solver(const char *, uint8_t [static 1], uint8_t [static 1]);
+long long parse_h48_hk(const char *, uint8_t [static 1], uint8_t [static 1]);
 long long int nissy_datainfo(uint64_t, const unsigned char *);
diff --git a/tools/tool.h b/tools/tool.h
index 77cdf34..225f789 100644
--- a/tools/tool.h
+++ b/tools/tool.h
@@ -126,7 +126,7 @@ derivetable(
                 goto derivetable_error;
         }
 
-        if (parse_h48_solver(solver_small, &h, &k) != 0) {
+        if (parse_h48_hk(solver_small, &h, &k) != NISSY_OK) {
                 gensize = -3;
                 goto derivetable_error;
         }