Merge remote-tracking branch 'upstream/master'

Merge upstream

1 files changed, 88 insertions, 4 deletions

diff --git a/tools/tool.h b/tools/tool.h
index 757657b..c44828d 100644
--- a/tools/tool.h
+++ b/tools/tool.h
@@ -6,14 +6,19 @@
 #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 int64_t derivetable(const char *, 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 21]);
+static void derivedata_run(
+    const char *, const char *, const char *, const char *);
 
 static void
 log_stderr(const char *str, ...)
@@ -70,6 +75,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;
@@ -109,6 +125,44 @@ generatetable(const char *solver, const char *options, char **buf)
         return gensize;
 }
 
+static int64_t
+derivetable(
+        const char *opts_large,
+        const char *opts_small,
+        const char *filename_large,
+        char **buf
+)
+{
+        uint8_t h;
+        int64_t size, gensize;
+        char *fulltable;
+
+        if (getdata("h48", opts_large, &fulltable, filename_large) != 0) {
+                printf("Error reading full table.\n");
+                return -1;
+        }
+
+        size = nissy_datasize("h48", opts_small);
+        if (size == -1) {
+                printf("Error getting table size.\n");
+                free(fulltable);
+                return -1;
+        }
+
+        h = atoi(opts_small); /* TODO: use option parser */
+        *buf = malloc(size);
+        gensize = gendata_h48_derive(h, fulltable, *buf);
+
+        if (gensize != size) {
+                fprintf(stderr, "Error deriving table\n");
+                free(fulltable);
+                return -2;
+        }
+
+        free(fulltable);
+        return gensize;
+}
+
 static int
 getdata(
         const char *solver,
@@ -155,13 +209,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:
@@ -182,3 +235,34 @@ gendata_run(
 gendata_run_finish:
         free(buf);
 }
+
+static void
+derivedata_run(
+        const char *opts_large,
+        const char *opts_small,
+        const char *filename_large,
+        const char *filename_small
+)
+{
+        int64_t size;
+        char *buf;
+
+        size = derivetable(opts_large, opts_small, filename_large, &buf);
+        switch (size) {
+        case -1:
+                return;
+        case -2:
+                goto derivedata_run_finish;
+        default:
+                nissy_datainfo(buf, write_stdout);
+                printf("\n");
+                printf("Succesfully generated %" PRId64 " bytes. "
+                       "See above for details on the tables.\n", size);
+
+                writetable(buf, size, filename_small);
+                break;
+        }
+
+derivedata_run_finish:
+        free(buf);
+}