Gendata added for h48k2, need to verify with new tool

5 files changed, 0 insertions, 161 deletions

diff --git a/test/113_gen_h48short/00_depth_1.in b/test/113_gen_h48short/00_depth_1.in
deleted file mode 100644
index c86f15b..0000000
--- a/test/113_gen_h48short/00_depth_1.in
+++ /dev/null
@@ -1,28 +0,0 @@
-73
-157
-1
-
-For longer test:
-
-20000003
-20000023
-8
-
-Short h48: generating depth 0
-found 1
-Short h48: generating depth 1
-found 1
-Short h48: generating depth 2
-found 4
-Short h48: generating depth 3
-found 34
-Short h48: generating depth 4
-found 333
-Short h48: generating depth 5
-found 3815
-Short h48: generating depth 6
-found 45382
-Short h48: generating depth 7
-found 548562
-Short h48: generating depth 8
-found 6839723
diff --git a/test/113_gen_h48short/00_depth_1.out b/test/113_gen_h48short/00_depth_1.out
deleted file mode 100644
index b0dba31..0000000
--- a/test/113_gen_h48short/00_depth_1.out
+++ /dev/null
@@ -1,3 +0,0 @@
-2
-0 0
-71075840 1
diff --git a/test/113_gen_h48short/01_depth_3.in b/test/113_gen_h48short/01_depth_3.in
deleted file mode 100644
index 920e70a..0000000
--- a/test/113_gen_h48short/01_depth_3.in
+++ /dev/null
@@ -1,3 +0,0 @@
-73
-157
-3
diff --git a/test/113_gen_h48short/01_depth_3.out b/test/113_gen_h48short/01_depth_3.out
deleted file mode 100644
index dbce376..0000000
--- a/test/113_gen_h48short/01_depth_3.out
+++ /dev/null
@@ -1,40 +0,0 @@
-40
-0 0
-70981632 3
-71075840 1
-71086080 3
-142067712 2
-218789888 3
-218884096 2
-283879424 2
-283899904 3
-283953152 3
-283973632 2
-360548808 3
-360835072 3
-473668032 3
-473956352 3
-499869696 3
-500011008 3
-598679552 3
-599109185 3
-662171648 3
-662601226 3
-724818316 3
-725106688 3
-790513664 3
-790607872 3
-904991108 3
-926726144 3
-928729088 3
-1009662340 3
-1088755203 3
-1171758595 3
-1206452224 3
-1206480896 3
-1277360128 3
-1277454336 3
-1403695492 3
-1403697540 3
-1403736452 3
-1403738500 3
diff --git a/test/113_gen_h48short/gen_h48short.c b/test/113_gen_h48short/gen_h48short.c
deleted file mode 100644
index 335821a..0000000
--- a/test/113_gen_h48short/gen_h48short.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "../test.h"
-
-#define COCSEP_CLASSES 3393
-#define MAXPOS 200
-
-typedef struct {
-        uint64_t n;
-        uint64_t capacity;
-        uint64_t randomizer;
-        uint64_t *table;
-        uint32_t *info;
-        uint32_t *cocsepdata;
-        uint32_t *h48data;
-        uint64_t selfsim[COCSEP_CLASSES];
-        cube_t crep[COCSEP_CLASSES];
-} h48map_t;
-
-typedef struct {
-        uint64_t key;
-        uint64_t val;
-} kvpair_t;
-
-typedef struct {
-        uint8_t maxdepth;
-        const uint32_t *cocsepdata;
-        const cube_t *crep;
-        const uint64_t *selfsim;
-        h48map_t *map;
-} gendata_h48short_arg_t;
-
-void h48map_create(h48map_t *, uint64_t, uint64_t);
-void h48map_destroy(h48map_t *);
-kvpair_t h48map_nextkvpair(h48map_t *, uint64_t *);
-size_t gendata_cocsep(void *, uint64_t *, cube_t *);
-uint64_t gen_h48short(gendata_h48short_arg_t *);
-
-char str[STRLENMAX];
-
-int compare(const void *x, const void *y) {
-        uint64_t a = ((kvpair_t *)x)->key;
-        uint64_t b = ((kvpair_t *)y)->key;
-
-        if (a > b) return 1;
-        if (a == b) return 0;
-        return -1;
-}
-
-uint64_t readl(void) {
-        fgets(str, STRLENMAX, stdin);
-        return atoll(str);
-}
-
-void run(void) {
-        uint32_t cocsepdata[300000];
-        h48map_t map;
-        uint64_t i, j, capacity, randomizer, selfsim[COCSEP_CLASSES];
-        kvpair_t kv, b[MAXPOS];
-        gendata_h48short_arg_t arg;
-        cube_t crep[COCSEP_CLASSES];
-
-        capacity = readl();
-        randomizer = readl();
-        arg.maxdepth = readl();
-        arg.cocsepdata = cocsepdata;
-        arg.crep = crep;
-        arg.selfsim = selfsim;
-        arg.map = ↦
-
-        h48map_create(&map, capacity, randomizer);
-        gendata_cocsep(cocsepdata, selfsim, crep);
-        gen_h48short(&arg);
-
-        i = 0;
-        for (kv = h48map_nextkvpair(&map, &i), j = 0;
-             i != map.capacity && j < MAXPOS;
-             kv = h48map_nextkvpair(&map, &i)
-        ) {
-                b[j++] = kv;
-        }
-        qsort(b, j, sizeof(kvpair_t), compare);
-
-        printf("%" PRIu64 "\n", map.n);
-        for (i = 0; i < j; i++)
-                printf("%" PRIu64 " %" PRIu64 "\n", b[i].key, b[i].val);
-
-        h48map_destroy(&map);
-}