Some type fixes and some cleanup

5 files changed, 83 insertions, 0 deletions

diff --git a/test/103_gendata_h48/00_h_0.in b/test/103_gendata_h48/00_h_0.in
new file mode 100644
index 0000000..573541a
--- /dev/null
+++ b/test/103_gendata_h48/00_h_0.in
@@ -0,0 +1 @@
+0
diff --git a/test/103_gendata_h48/00_h_0.out b/test/103_gendata_h48/00_h_0.out
new file mode 100644
index 0000000..db6e121
--- /dev/null
+++ b/test/103_gendata_h48/00_h_0.out
@@ -0,0 +1,23 @@
+59903545
+
+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: 329
+5: 3587
diff --git a/test/103_gendata_h48/01_h_1.in b/test/103_gendata_h48/01_h_1.in
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/test/103_gendata_h48/01_h_1.in
@@ -0,0 +1 @@
+1
diff --git a/test/103_gendata_h48/01_h_1.out b/test/103_gendata_h48/01_h_1.out
new file mode 100644
index 0000000..456305d
--- /dev/null
+++ b/test/103_gendata_h48/01_h_1.out
@@ -0,0 +1,23 @@
+118687270
+
+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/gendata_h48_tests.c b/test/103_gendata_h48/gendata_h48_tests.c
new file mode 100644
index 0000000..f0910cc
--- /dev/null
+++ b/test/103_gendata_h48/gendata_h48_tests.c
@@ -0,0 +1,35 @@
+#include "../test.h"
+
+#define MAXDEPTH 5
+#define COCSEPSIZE 1119792
+#define ETABLESIZE(h) (((3393 * 495 * 70) >> 1) << (size_t)(h))
+
+size_t gendata_h48(void *, uint8_t, uint8_t);
+
+int main(void) {
+        char str[STRLENMAX];
+        uint8_t h, 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;
+
+        printf("%zu\n\n", result);
+
+        printf("cocsepdata:\n");
+        printf("Classes: %" PRIu32 "\n", buf[COCSEPSIZE/4-12]);
+        printf("Max value: %" PRIu32 "\n", buf[COCSEPSIZE/4-11]);
+        for (i = 0; i < 10; i++)
+                printf("%" PRIu32 ": %" PRIu32 "\n", i, buf[COCSEPSIZE/4-10+i]);
+
+        printf("\nh48:\n");
+        for (i = 0; i < MAXDEPTH+1; i++)
+                printf("%" PRIu32 ": %" PRIu32 "\n", i, h48info[i+1]);
+
+        free(buf);
+        return 0;
+}