4 files changed, 64 insertions, 2 deletions

diff --git a/tools/001_gendata_h48h0k4/gendata_h48h0k4.c b/tools/001_gendata_h48h0k4/gendata_h48h0k4.c
index 0926a34..a2c57ca 100644
--- a/tools/001_gendata_h48h0k4/gendata_h48h0k4.c
+++ b/tools/001_gendata_h48h0k4/gendata_h48h0k4.c
@@ -37,12 +37,12 @@ void run(void) {
                 printf("Error generating table\n");
         } else {
                 printf("Succesfully generated %" PRId64 " bytes. Table:\n", s);
-                h48info = (uint32_t *)buf + (ETABLESIZE(HVALUE) + COCSEPSIZE) / 4;
+                h48info = (uint32_t *)buf + 1 + (ETABLESIZE(HVALUE) + COCSEPSIZE) / 4;
                 for (i = 0; i < MAXDEPTH+1 && h48info[i+1]; i++) {
                         x = h48info[i+1];
                         printf("%d:\t%" PRIu32, i, x);
                         if (x != expected[i])
-                                printf(" <--- Error! Expected: %" PRIu32 "\n",
+                                printf(" <--- Error! Expected: %" PRIu32,
                                     expected[i]);
                         printf("\n");
                 }
diff --git a/tools/002_gendata_h48h0k2/gendata_h48h0k2.c b/tools/002_gendata_h48h0k2/gendata_h48h0k2.c
new file mode 100644
index 0000000..2754f80
--- /dev/null
+++ b/tools/002_gendata_h48h0k2/gendata_h48h0k2.c
@@ -0,0 +1,62 @@
+#include "../tool.h"
+
+#define MAXDEPTH 20
+#define HVALUE 0
+#define OPTIONS "0;2;20"
+#define LONGOPTIONS "h = 0, k = 2, max depth = 20"
+
+#define COCSEPSIZE 1119792
+#define ETABLESIZE(h) (((3393 * 495 * 70) >> 2) << (size_t)(h))
+
+uint32_t expected[21] = {
+        /* Base value is 8 */
+        [0] = 5473562,
+        [1] = 34776317,
+        [2] = 68566704,
+        [3] = 8750867,
+};
+
+char *buf;
+
+void run(void) {
+        uint32_t *h48info, x;
+        int i;
+        int64_t s;
+
+        s = nissy_gendata("h48", OPTIONS, buf);
+
+        if (s == -1) {
+                printf("Error generating table\n");
+        } else {
+                printf("Succesfully generated %" PRId64 " bytes. Table:\n", s);
+                h48info = (uint32_t *)buf + 1 + (ETABLESIZE(HVALUE) + COCSEPSIZE) / 4;
+                for (i = 0; i < 4; i++) {
+                        x = h48info[i+1];
+                        printf("%d:\t%" PRIu32, i, x);
+                        if (x != expected[i])
+                                printf(" <--- Error! Expected: %" PRIu32,
+                                    expected[i]);
+                        printf("\n");
+                }
+        }
+}
+
+int main(void) {
+        int64_t size;
+
+        nissy_setlogger(log_stderr);
+
+        size = nissy_datasize("h48", OPTIONS);
+        if (size == -1) {
+                printf("gendata_h48 benchmark: error in datasize\n");
+                return 1;
+        }
+
+        buf = malloc(size);
+
+        timerun(run, "benchmark gendata_h48 " LONGOPTIONS);
+
+        free(buf);
+
+        return 0;
+}
diff --git a/tools/002_stats_tables_h48/stats_tables_h48.c b/tools/010_stats_tables_h48/stats_tables_h48.c
index 8b65862..8b65862 100644
--- a/tools/002_stats_tables_h48/stats_tables_h48.c
+++ b/tools/010_stats_tables_h48/stats_tables_h48.c
diff --git a/tools/003_solve_small/solve_small.c b/tools/020_solve_small/solve_small.c
index dee2b55..dee2b55 100644
--- a/tools/003_solve_small/solve_small.c
+++ b/tools/020_solve_small/solve_small.c