Stats for h48 solver as tool

6 files changed, 6 insertions, 32 deletions

diff --git a/test/103_gendata_h48/00_h_0.in b/test/103_gendata_h48/00_h_0.in
deleted file mode 100644
index 573541a..0000000
--- a/test/103_gendata_h48/00_h_0.in
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/103_gendata_h48/01_h_1.in b/test/103_gendata_h48/01_h_1.in
deleted file mode 100644
index d00491f..0000000
--- a/test/103_gendata_h48/01_h_1.in
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/103_gendata_h48/01_h_1.out b/test/103_gendata_h48/01_h_1.out
deleted file mode 100644
index bd0931c..0000000
--- a/test/103_gendata_h48/01_h_1.out
+++ /dev/null
@@ -1,23 +0,0 @@
-118687330
-
-cocsepdata:
-Classes: 3393
-Max value: 9
-0: 1
-1: 6
-2: 63
-3: 468
-4: 3068
-5: 15438
-6: 53814
-7: 71352
-8: 8784
-9: 96
-
-h48:
-0: 1
-1: 1
-2: 4
-3: 34
-4: 375
-5: 4078
diff --git a/test/103_gendata_h48_h0/00_h_0.in b/test/103_gendata_h48_h0/00_h_0.in
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/103_gendata_h48_h0/00_h_0.in
diff --git a/test/103_gendata_h48/00_h_0.out b/test/103_gendata_h48_h0/00_h_0.out
index cc5cf9b..cc5cf9b 100644
--- a/test/103_gendata_h48/00_h_0.out
+++ b/test/103_gendata_h48_h0/00_h_0.out
diff --git a/test/103_gendata_h48/gendata_h48_tests.c b/test/103_gendata_h48_h0/gendata_h48_tests.c
index 666f9f6..ed17915 100644
--- a/test/103_gendata_h48/gendata_h48_tests.c
+++ b/test/103_gendata_h48_h0/gendata_h48_tests.c
@@ -2,21 +2,20 @@
 
 #define MAXDEPTH 5
 #define COCSEPSIZE 1119792
-#define ETABLESIZE(h) (((3393 * 495 * 70) >> 1) << (size_t)(h))
+#define ETABLESIZE ((3393 * 495 * 70) >> 1)
 
-size_t gendata_h48(void *, uint8_t, uint8_t);
+size_t gendata_h48h0k4(void *, uint8_t);
 
 void run(void) {
         char str[STRLENMAX];
-        uint8_t h, i;
+        uint8_t i;
         uint32_t *buf, *h48info;
         size_t result;
 
         fgets(str, STRLENMAX, stdin);
-        h = atoi(str);
-        buf = (uint32_t *)malloc(sizeof(uint32_t) * (60000000 << h));
-        result = gendata_h48(buf, h, MAXDEPTH);
-        h48info = buf + (ETABLESIZE(h) + COCSEPSIZE) / 4;
+        buf = (uint32_t *)malloc(sizeof(uint32_t) * 60000000);
+        result = gendata_h48h0k4(buf, MAXDEPTH);
+        h48info = buf + (ETABLESIZE + COCSEPSIZE) / 4;
 
         printf("%zu\n\n", result);