Merge remote-tracking branch 'upstream/master'

Merge upstream

22 files changed, 271 insertions, 287 deletions

diff --git a/tools/0002_gendata_h48h0k2/gendata_h48h0k2.c b/tools/0002_gendata_h48h0k2/gendata_h48h0k2.c
deleted file mode 100644
index 14f99ee..0000000
--- a/tools/0002_gendata_h48h0k2/gendata_h48h0k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 5473562,
-        [1] = 34776317,
-        [2] = 68566704,
-        [3] = 8750867,
-};
-
-void run(void) {
-        gendata_run("h48", "0;2;20", "tables/h48h0k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 0, k = 2");
-
-        return 0;
-}
diff --git a/tools/0004_gendata_h48h0k4/gendata_h48h0k4.c b/tools/0004_gendata_h48h0k4/gendata_h48h0k4.c
deleted file mode 100644
index ff34bb9..0000000
--- a/tools/0004_gendata_h48h0k4/gendata_h48h0k4.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        [0] = 1,
-        [1] = 1,
-        [2] = 4,
-        [3] = 34,
-        [4] = 331,
-        [5] = 3612,
-        [6] = 41605,
-        [7] = 474128,
-        [8] = 4953846,
-        [9] = 34776317,
-        [10] = 68566704,
-        [11] = 8749194,
-        [12] = 1673,
-};
-
-void run(void) {
-        gendata_run("h48", "0;4;20", "tables/h48h0k4", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 0, k = 4");
-
-        return 0;
-}
diff --git a/tools/000_gendata/gendata.c b/tools/000_gendata/gendata.c
new file mode 100644
index 0000000..90166dd
--- /dev/null
+++ b/tools/000_gendata/gendata.c
@@ -0,0 +1,55 @@
+#include "../tool.h"
+#include "../expected_distributions.h"
+
+char *solver, *options;
+uint64_t *expected;
+
+static void
+run(void) {
+        int64_t size;
+        char *buf, filename[1024];
+        
+        getfilename(solver, options, filename);
+        size = generatetable(solver, options, &buf);
+        switch (size) {
+        case -1:
+                return;
+        case -2:
+                goto gendata_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);
+                break;
+        }
+
+gendata_run_finish:
+        free(buf);
+}
+
+int main(int argc, char **argv) {
+        uint8_t h, k;
+        char description[256];
+
+        if (argc < 3) {
+                fprintf(stderr, "Error: not enough arguments. "
+                    "A solver and its options must be given.\n");
+                return 1;
+        }
+
+        solver = argv[1];
+        options = argv[2];
+        parse_h48_options(options, &h, &k, NULL);
+        expected = expected_h48[h][k];
+        sprintf(description, "benchmark gendata_h48 h = %" PRIu8
+            ", k = %" PRIu8 "", h, k);
+
+        nissy_setlogger(log_stderr);
+
+        timerun(run, description);
+
+        return 0;
+}
diff --git a/tools/0012_gendata_h48h1k2/gendata_h48h1k2.c b/tools/0012_gendata_h48h1k2/gendata_h48h1k2.c
deleted file mode 100644
index 0ebdcaa..0000000
--- a/tools/0012_gendata_h48h1k2/gendata_h48h1k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "1;2;20", "tables/h48h1k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 1, k = 2");
-
-        return 0;
-}
diff --git a/tools/001_derive_h48/derive_h48.c b/tools/001_derive_h48/derive_h48.c
new file mode 100644
index 0000000..3c7f8cc
--- /dev/null
+++ b/tools/001_derive_h48/derive_h48.c
@@ -0,0 +1,33 @@
+#include "../tool.h"
+
+char *opts_large, *opts_small, *filename_large, *filename_small;
+
+void run(void) {
+        derivedata_run(opts_large, opts_small, filename_large, filename_small);
+}
+
+int main(int argc, char **argv) {
+        char description[256];
+
+        if (argc < 5) {
+                fprintf(stderr,
+                    "Error: not enough arguments. Required:\n"
+                    "1. Options for large table\n"
+                    "2. Options for derived table\n"
+                    "3. Filename containing large table\n"
+                    "4. Filename for saving derived table\n");
+                return 1;
+        }
+
+        opts_large = argv[1];
+        opts_small = argv[2];
+        filename_large = argv[3];
+        filename_small = argv[4];
+        sprintf(description, "deriving %s from %s\n", opts_small, opts_large);
+
+        nissy_setlogger(log_stderr);
+
+        timerun(run, description);
+
+        return 0;
+}
diff --git a/tools/0022_gendata_h48h2k2/gendata_h48h2k2.c b/tools/0022_gendata_h48h2k2/gendata_h48h2k2.c
deleted file mode 100644
index f437e98..0000000
--- a/tools/0022_gendata_h48h2k2/gendata_h48h2k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "2;2;20", "tables/h48h2k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 2, k = 2");
-
-        return 0;
-}
diff --git a/tools/0032_gendata_h48h3k2/gendata_h48h3k2.c b/tools/0032_gendata_h48h3k2/gendata_h48h3k2.c
deleted file mode 100644
index 2e0eab5..0000000
--- a/tools/0032_gendata_h48h3k2/gendata_h48h3k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "3;2;20", "tables/h48h3k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 3, k = 2");
-
-        return 0;
-}
diff --git a/tools/0042_gendata_h48h4k2/gendata_h48h4k2.c b/tools/0042_gendata_h48h4k2/gendata_h48h4k2.c
deleted file mode 100644
index 868c360..0000000
--- a/tools/0042_gendata_h48h4k2/gendata_h48h4k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "4;2;20", "tables/h48h4k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 4, k = 2");
-
-        return 0;
-}
diff --git a/tools/0052_gendata_h48h5k2/gendata_h48h5k2.c b/tools/0052_gendata_h48h5k2/gendata_h48h5k2.c
deleted file mode 100644
index d292d49..0000000
--- a/tools/0052_gendata_h48h5k2/gendata_h48h5k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "5;2;20", "tables/h48h5k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 5, k = 2");
-
-        return 0;
-}
diff --git a/tools/0062_gendata_h48h6k2/gendata_h48h6k2.c b/tools/0062_gendata_h48h6k2/gendata_h48h6k2.c
deleted file mode 100644
index 910d514..0000000
--- a/tools/0062_gendata_h48h6k2/gendata_h48h6k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "6;2;20", "tables/h48h6k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 6, k = 2");
-
-        return 0;
-}
diff --git a/tools/0072_gendata_h48h7k2/gendata_h48h7k2.c b/tools/0072_gendata_h48h7k2/gendata_h48h7k2.c
deleted file mode 100644
index b803328..0000000
--- a/tools/0072_gendata_h48h7k2/gendata_h48h7k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "7;2;20", "tables/h48h7k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 7, k = 2");
-
-        return 0;
-}
diff --git a/tools/0082_gendata_h48h8k2/gendata_h48h8k2.c b/tools/0082_gendata_h48h8k2/gendata_h48h8k2.c
deleted file mode 100644
index 52c377a..0000000
--- a/tools/0082_gendata_h48h8k2/gendata_h48h8k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "8;2;20", "tables/h48h8k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 8, k = 2");
-
-        return 0;
-}
diff --git a/tools/0092_gendata_h48h9k2/gendata_h48h9k2.c b/tools/0092_gendata_h48h9k2/gendata_h48h9k2.c
deleted file mode 100644
index 5d3e34a..0000000
--- a/tools/0092_gendata_h48h9k2/gendata_h48h9k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "9;2;20", "tables/h48h9k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 9, k = 2");
-
-        return 0;
-}
diff --git a/tools/0102_gendata_h48h10k2/gendata_h48h10k2.c b/tools/0102_gendata_h48h10k2/gendata_h48h10k2.c
deleted file mode 100644
index 5e8fbb0..0000000
--- a/tools/0102_gendata_h48h10k2/gendata_h48h10k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "10;2;20", "tables/h48h10k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 10, k = 2");
-
-        return 0;
-}
diff --git a/tools/0112_gendata_h48h11k2/gendata_h48h11k2.c b/tools/0112_gendata_h48h11k2/gendata_h48h11k2.c
deleted file mode 100644
index 00c0747..0000000
--- a/tools/0112_gendata_h48h11k2/gendata_h48h11k2.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "../tool.h"
-
-uint64_t expected[21] = {
-        /* Base value is 8 */
-        [0] = 0, /* Unknown */
-        [1] = 0, /* Unknown */
-        [2] = 0, /* Unknown */
-        [3] = 0, /* Unknown */
-};
-
-void run(void) {
-        gendata_run("h48", "11;2;20", "tables/h48h11k2", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark gendata_h48 h = 11, k = 2");
-
-        return 0;
-}
diff --git a/tools/100_checkdata/checkdata.c b/tools/100_checkdata/checkdata.c
new file mode 100644
index 0000000..05961c1
--- /dev/null
+++ b/tools/100_checkdata/checkdata.c
@@ -0,0 +1,52 @@
+#include "../tool.h"
+#include "../expected_distributions.h"
+
+char *solver, *options, *filename;
+
+static void
+run(void) {
+        int64_t size;
+        char *buf;
+        FILE *f;
+        
+        size = nissy_datasize(solver, options);
+
+        if (size <= 0) {
+                fprintf(stderr, "Error in datasize\n");
+                return;
+        }
+
+        if ((f = fopen(filename, "rb")) == NULL) {
+                fprintf(stderr, "Error reading file %s\n", filename);
+                return;
+        }
+
+        buf = malloc(size);
+        fread(buf, size, 1, f);
+        fclose(f);
+        nissy_checkdata(solver, options, buf);
+        free(buf);
+
+        /* TODO: cross-check with expected distributions? */
+}
+
+int main(int argc, char **argv) {
+        char description[256];
+
+        if (argc < 4) {
+                fprintf(stderr, "Error: not enough arguments. "
+                    "A solver, its options and a file name must be given.\n");
+                return 1;
+        }
+
+        solver = argv[1];
+        options = argv[2];
+        filename = argv[3];
+        sprintf(description, "checking data for solver %s"
+            "with options %s from file %s", solver, options, filename);
+        nissy_setlogger(log_stderr);
+
+        timerun(run, description);
+
+        return 0;
+}
diff --git a/tools/100_stats_tables_h48/stats_tables_h48.c b/tools/200_stats_tables_h48/stats_tables_h48.c
index adac8fa..adac8fa 100644
--- a/tools/100_stats_tables_h48/stats_tables_h48.c
+++ b/tools/200_stats_tables_h48/stats_tables_h48.c
diff --git a/tools/200_solve_small/solve_small.c b/tools/300_solve_small/solve_small.c
index d476bce..d476bce 100644
--- a/tools/200_solve_small/solve_small.c
+++ b/tools/300_solve_small/solve_small.c
diff --git a/tools/expected_distributions.h b/tools/expected_distributions.h
new file mode 100644
index 0000000..535cab2
--- /dev/null
+++ b/tools/expected_distributions.h
@@ -0,0 +1,33 @@
+uint64_t expected_h48[12][9][21] = {
+        [0] = {
+                [2] = {
+                        [0] = 5473562,
+                        [1] = 34776317,
+                        [2] = 68566704,
+                        [3] = 8750867,
+                },
+                [4] = {
+                        [0] = 1,
+                        [1] = 1,
+                        [2] = 4,
+                        [3] = 34,
+                        [4] = 331,
+                        [5] = 3612,
+                        [6] = 41605,
+                        [7] = 474128,
+                        [8] = 4953846,
+                        [9] = 34776317,
+                        [10] = 68566704,
+                        [11] = 8749194,
+                        [12] = 1673,
+                },
+        },
+        [1] = {
+                [2] = {
+                        [0] = 6012079,
+                        [1] = 45822302,
+                        [2] = 142018732,
+                        [3] = 41281787,
+                },
+        },
+};
diff --git a/tools/nissy_extra.h b/tools/nissy_extra.h
new file mode 100644
index 0000000..1e714a7
--- /dev/null
+++ b/tools/nissy_extra.h
@@ -0,0 +1,7 @@
+/*
+This header file exposes certain functions that are meant to be used
+for testing purposes only.
+*/
+
+size_t gendata_h48_derive(uint8_t, const void *, void *);
+int parse_h48_options(const char *, uint8_t *, uint8_t *, uint8_t *);
diff --git a/tools/run_tool.sh b/tools/run_tool.sh
index 7e09684..2216a66 100755
--- a/tools/run_tool.sh
+++ b/tools/run_tool.sh
@@ -5,7 +5,7 @@ if [ -z "$TOOL" ]; then
         exit 1
 fi
 
-CC="$CC -D_POSIX_C_SOURCE=199309L"
+CC="$CC -D_POSIX_C_SOURCE=199309L" # For timer
 
 BIN="tools/run"
 d="$(date +'%Y-%m-%d-%H-%M-%S')"
@@ -16,7 +16,8 @@ for t in tools/*; do
         fi
         toolname="$(basename "$t" .c)"
         $CC -o $BIN "$t"/*.c "$CUBEOBJ" || exit 1;
-        $BIN | tee "tools/results/$toolname-$d.txt" "tools/results/last.out"
+        $BIN $TOOLARGS \
+                | tee "tools/results/$toolname-$d.txt" "tools/results/last.out"
         break
 done
 
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);
+}