2 files changed, 33 insertions, 21 deletions

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/001_derive_h48h0k2/derive_h48h0k2.c b/tools/001_derive_h48h0k2/derive_h48h0k2.c
deleted file mode 100644
index 73fab2e..0000000
--- a/tools/001_derive_h48h0k2/derive_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) {
-        derivedata_run(0, "tables/h48h0k2_derived", expected);
-}
-
-int main(void) {
-        nissy_setlogger(log_stderr);
-
-        timerun(run, "benchmark derivedata_h48 h = 0, k = 2");
-
-        return 0;
-}