1 files changed, 16 insertions, 4 deletions

diff --git a/tools/tool.h b/tools/tool.h
index 757657b..1540f22 100644
--- a/tools/tool.h
+++ b/tools/tool.h
@@ -6,14 +6,16 @@
 #include <stdlib.h>
 
 #include "../src/nissy.h"
+#include "nissy_extra.h"
 
 static void log_stderr(const char *, ...);
 static void log_stdout(const char *, ...);
 static double timerun(void (*)(void), const char *);
+static void getfilename(const char *, const char *, char *);
 static void writetable(const char *, int64_t, const char *);
 static int64_t generatetable(const char *, const char *, char **);
 static int getdata(const char *, const char *, char **, const char *);
-static void gendata_run(const char *, const char *, const char *, uint64_t[static 21]);
+static void gendata_run(const char *, const char *, uint64_t *);
 
 static void
 log_stderr(const char *str, ...)
@@ -70,6 +72,17 @@ timerun(void (*run)(void), const char *name)
 }
 
 static void
+getfilename(const char *solver, const char *options, char *filename)
+{
+        uint8_t h, k;
+
+        /* Only h48 supported for now */
+        parse_h48_options(options, &h, &k, NULL);
+
+        sprintf(filename, "tables/%sh%dk%d", solver, h, k);
+}
+
+static void
 writetable(const char *buf, int64_t size, const char *filename)
 {
         FILE *f;
@@ -155,13 +168,12 @@ static void
 gendata_run(
         const char *solver,
         const char *options,
-        const char *filename, /* TODO: remove filename, use solver name */
         uint64_t expected[static 21]
 ) {
         int64_t size;
-        char *buf;
+        char *buf, filename[1024];
 
-        
+        getfilename(solver, options, filename);
         size = generatetable(solver, options, &buf);
         switch (size) {
         case -1: