Finally fixed selfsim logic

9 files changed, 16 insertions, 4 deletions

diff --git a/test/111_gendata_h48_h0/00_h_0.in b/test/111_gendata_h48_h0/00_h_0.in
deleted file mode 100644
index e69de29..0000000
--- a/test/111_gendata_h48_h0/00_h_0.in
+++ /dev/null
diff --git a/test/112_h48map/00_small.in b/test/111_h48map/00_small.in
index ee8e591..ee8e591 100644
--- a/test/112_h48map/00_small.in
+++ b/test/111_h48map/00_small.in
diff --git a/test/112_h48map/00_small.out b/test/111_h48map/00_small.out
index 260e804..260e804 100644
--- a/test/112_h48map/00_small.out
+++ b/test/111_h48map/00_small.out
diff --git a/test/112_h48map/01_large.in b/test/111_h48map/01_large.in
index 1812b40..1812b40 100644
--- a/test/112_h48map/01_large.in
+++ b/test/111_h48map/01_large.in
diff --git a/test/112_h48map/01_large.out b/test/111_h48map/01_large.out
index f5e00d8..f5e00d8 100644
--- a/test/112_h48map/01_large.out
+++ b/test/111_h48map/01_large.out
diff --git a/test/112_h48map/h48map_tests.c b/test/111_h48map/h48map_tests.c
index d70bc3a..d70bc3a 100644
--- a/test/112_h48map/h48map_tests.c
+++ b/test/111_h48map/h48map_tests.c
diff --git a/test/112_gendata_h48/00_h_0.in b/test/112_gendata_h48/00_h_0.in
new file mode 100644
index 0000000..cb6e5ed
--- /dev/null
+++ b/test/112_gendata_h48/00_h_0.in
@@ -0,0 +1,2 @@
+5
+0
diff --git a/test/111_gendata_h48_h0/00_h_0.out b/test/112_gendata_h48/00_h_0.out
index 04e8bf6..04e8bf6 100644
--- a/test/111_gendata_h48_h0/00_h_0.out
+++ b/test/112_gendata_h48/00_h_0.out
diff --git a/test/111_gendata_h48_h0/gendata_h48_tests.c b/test/112_gendata_h48/gendata_h48_tests.c
index e9de3c0..485d9d0 100644
--- a/test/111_gendata_h48_h0/gendata_h48_tests.c
+++ b/test/112_gendata_h48/gendata_h48_tests.c
@@ -1,20 +1,30 @@
 #include "../test.h"
 
-#define MAXDEPTH 5
 #define COCSEPSIZE 1119792
 #define ETABLESIZE ((3393 * 495 * 70) >> 1)
 
 int64_t gendata_h48h0k4(void *, uint8_t);
 
+int64_t gendata_h48_fixture(void *buf, uint8_t maxdepth, uint8_t h) {
+        if (h == 0)
+                return gendata_h48h0k4(buf, maxdepth);
+        fprintf(stderr, "Error: gendata h48 for h>0 not implemented yet\n");
+        exit(1);
+}
+
 void run(void) {
         char str[STRLENMAX];
-        uint8_t i;
+        uint8_t i, maxdepth, h;
         uint32_t *buf, *h48info;
         size_t result;
 
         fgets(str, STRLENMAX, stdin);
+        maxdepth = atoi(str);
+        fgets(str, STRLENMAX, stdin);
+        h = atoi(str);
+
         buf = (uint32_t *)malloc(sizeof(uint32_t) * 60000000);
-        result = gendata_h48h0k4(buf, MAXDEPTH);
+        result = gendata_h48_fixture(buf, maxdepth, h);
         h48info = buf + (ETABLESIZE + COCSEPSIZE) / 4;
 
         printf("%zu\n\n", result);
@@ -26,7 +36,7 @@ void run(void) {
                 printf("%" PRIu32 ": %" PRIu32 "\n", i, buf[COCSEPSIZE/4-10+i]);
 
         printf("\nh48:\n");
-        for (i = 0; i < MAXDEPTH+1; i++)
+        for (i = 0; i < maxdepth+1; i++)
                 printf("%" PRIu32 ": %" PRIu32 "\n", i, h48info[i+1]);
 
         free(buf);