3 files changed, 100 insertions, 16 deletions

diff --git a/src/nissy.c b/src/nissy.c
index 08cacf0..e610199 100644
--- a/src/nissy.c
+++ b/src/nissy.c
@@ -13,8 +13,8 @@
 
 int parse_h48_options(const char *, uint8_t *, uint8_t *, uint8_t *);
 STATIC int64_t write_result(cube_t, char [static 22]);
-STATIC bool distribution_equal(
-    const uint64_t [static 21], const uint64_t [static 21], uint8_t);
+STATIC bool distribution_equal(const uint64_t [static INFO_DISTRIBUTION_LEN],
+    const uint64_t [static INFO_DISTRIBUTION_LEN], uint8_t);
 STATIC bool checkdata(const void *, const tableinfo_t *);
 
 /* TODO: add option to get DR, maybe C-only, E-only, eo... */
@@ -68,7 +68,7 @@ parse_h48_options_error:
 STATIC bool
 checkdata(const void *buf, const tableinfo_t *info)
 {
-        uint64_t distr[21];
+        uint64_t distr[INFO_DISTRIBUTION_LEN];
 
         if (!strncmp(info->solver, "cocsep", 6)) {
                 getdistribution_cocsep(
@@ -86,8 +86,8 @@ checkdata(const void *buf, const tableinfo_t *info)
 
 STATIC bool
 distribution_equal(
-        const uint64_t expected[static 21],
-        const uint64_t actual[static 21],
+        const uint64_t expected[static INFO_DISTRIBUTION_LEN],
+        const uint64_t actual[static INFO_DISTRIBUTION_LEN],
         uint8_t maxvalue
 )
 {
diff --git a/src/nissy.h b/src/nissy.h
index e8c35c3..0545556 100644
--- a/src/nissy.h
+++ b/src/nissy.h
@@ -86,6 +86,13 @@ int64_t nissy_gendata(
         void *generated_data
 );
 
+/* Temporarily added to test h48 intermediate tables */
+int64_t nissy_derivedata(
+        const char *options,
+        const void *fulltable,
+        void *generated_data
+);
+
 int64_t nissy_checkdata(
         const char *solver,
         const char *options,
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index 6e7b0ca..b1ae38c 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -103,9 +103,9 @@ STATIC_INLINE bool gendata_h48k2_dfs_stop(cube_t, int8_t, h48k2_dfs_arg_t *);
 STATIC size_t gendata_h48k2_realcoord(gendata_h48_arg_t *);
 STATIC void gendata_h48k2_dfs(h48k2_dfs_arg_t *arg);
 STATIC void * gendata_h48k2_runthread(void *);
-STATIC tableinfo_t makeinfo_h48k2(gendata_h48_arg_t *, uint8_t);
-STATIC void getdistribution_h48(
-    const uint8_t *, uint64_t [static 21], uint8_t, uint8_t);
+STATIC tableinfo_t makeinfo_h48k2(gendata_h48_arg_t *);
+STATIC void getdistribution_h48(const uint8_t *,
+    uint64_t [static INFO_DISTRIBUTION_LEN], uint8_t, uint8_t);
 
 STATIC uint32_t *get_cocsepdata_ptr(const void *);
 STATIC uint8_t *get_h48data_ptr(const void *);
@@ -115,6 +115,8 @@ STATIC_INLINE void set_h48_pval(uint8_t *, int64_t, uint8_t, uint8_t);
 STATIC_INLINE uint8_t get_h48_bound(
     cube_t, uint32_t, uint8_t, uint8_t, uint8_t *);
 
+size_t gendata_h48_derive(uint8_t, const void *, void *);
+
 STATIC uint64_t
 gendata_h48short(gendata_h48short_arg_t *arg)
 {
@@ -390,7 +392,7 @@ gendata_h48k2(gendata_h48_arg_t *arg)
                 [11] = 10
         };
 
-        uint8_t t, selectedbase, *table;
+        uint8_t t, *table;
         int64_t j;
         uint64_t i, ii, inext, count;
         h48map_t shortcubes;
@@ -417,8 +419,9 @@ gendata_h48k2(gendata_h48_arg_t *arg)
         };
         gendata_h48short(&shortarg);
 
-        selectedbase = arg->base < 20 ? arg->base : base[arg->h];
-        arg->info = makeinfo_h48k2(arg, selectedbase);
+        if (arg->base >= 20)
+                arg->base = base[arg->h];
+        arg->info = makeinfo_h48k2(arg);
 
         inext = count = 0;
         pthread_mutex_init(&shortcubes_mutex, NULL);
@@ -428,7 +431,7 @@ gendata_h48k2(gendata_h48_arg_t *arg)
                 dfsarg[i] = (h48k2_dfs_arg_t){
                         .h = arg->h,
                         .k = arg->k,
-                        .base = selectedbase,
+                        .base = arg->base,
                         .shortdepth = shortdepth,
                         .cocsepdata = arg->cocsepdata,
                         .table = table,
@@ -640,7 +643,7 @@ gendata_h48k2_realcoord_runthread(void *arg)
 }
 
 STATIC tableinfo_t
-makeinfo_h48k2(gendata_h48_arg_t *arg, uint8_t base)
+makeinfo_h48k2(gendata_h48_arg_t *arg)
 {
         tableinfo_t info;
 
@@ -654,7 +657,7 @@ makeinfo_h48k2(gendata_h48_arg_t *arg, uint8_t base)
                 .classes = 0,
                 .h48h = arg->h,
                 .bits = 2,
-                .base = base,
+                .base = arg->base,
                 .maxvalue = 3,
                 .next = 0,
         };
@@ -668,14 +671,14 @@ makeinfo_h48k2(gendata_h48_arg_t *arg, uint8_t base)
 STATIC void
 getdistribution_h48(
         const uint8_t *table,
-        uint64_t distr[static 21],
+        uint64_t distr[static INFO_DISTRIBUTION_LEN],
         uint8_t h,
         uint8_t k
 ) {
         uint8_t val;
         int64_t i, h48max;
 
-        memset(distr, 0, 21 * sizeof(uint64_t));
+        memset(distr, 0, INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
 
         h48max = H48_COORDMAX(h);
         for (i = 0; i < h48max; i++) {
@@ -717,3 +720,77 @@ get_h48_bound(cube_t cube, uint32_t cdata, uint8_t h, uint8_t k, uint8_t *table)
         coord = coord_h48_edges(cube, COCLASS(cdata), TTREP(cdata), h);
         return get_h48_pval(table, coord, k);
 }
+
+size_t
+gendata_h48_derive(uint8_t h, const void *fulltable, void *buf)
+{
+        size_t cocsepsize, h48size;
+        uint8_t val_full, val_derive, *h48full, *h48derive;
+        int64_t i, j, h48max;
+        gendata_h48_arg_t arg;
+        tableinfo_t cocsepinfo, fulltableinfo;
+
+        /* Initializing values in case of error */
+        /* TODO cleanup this */
+        fulltableinfo.bits = 2;
+        fulltableinfo.base = 8;
+
+        readtableinfo_n(fulltable, 2, &fulltableinfo);
+        arg.h = h;
+        arg.k = fulltableinfo.bits;
+        arg.maxdepth = 20;
+        arg.buf = buf;
+        arg.cocsepdata = (uint32_t *)((char *)buf + INFOSIZE);
+        arg.base = fulltableinfo.base;
+        arg.info = makeinfo_h48k2(&arg);
+
+        /* Technically this step is redundant, except that we
+           need selfsim and crep */
+        cocsepsize = gendata_cocsep(buf, arg.selfsim, arg.crep);
+        arg.h48buf = (char *)buf + cocsepsize;
+        h48size = H48_TABLESIZE(h, arg.k) + INFOSIZE;
+
+        if (buf == NULL)
+                goto gendata_h48_derive_return_size;
+
+        if (!readtableinfo(buf, &cocsepinfo)) {
+                LOG("gendata_h48: could not read info for cocsep table\n");
+                goto gendata_h48_derive_error;
+        }
+
+        cocsepinfo.next = cocsepsize;
+        if (!writetableinfo(&cocsepinfo, buf)) {
+                LOG("gendata_h48_derive: could not write info for cocsep table"
+                    " with updated 'next' value\n");
+                goto gendata_h48_derive_error;
+        }
+
+        h48full = (uint8_t *)fulltable + INFOSIZE;
+        h48derive = (uint8_t *)arg.h48buf + INFOSIZE;
+        memset(h48derive, 0xFF, H48_TABLESIZE(h, arg.k));
+        memset(arg.info.distribution, 0,
+            INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
+
+        h48max = H48_COORDMAX(11);
+        for (i = 0; i < h48max; i++) {
+                if (i % INT64_C(1000000000) == 0)
+                        LOG("Processing %" PRId64 "th coordinate\n", i);
+                j = i >> (int64_t)(11-h);
+                val_full = get_h48_pval(h48full, i, arg.k);
+                val_derive = get_h48_pval(h48derive, j, arg.k);
+                set_h48_pval(h48derive, j, arg.k, MIN(val_full, val_derive));
+        }
+
+        getdistribution_h48(h48derive, arg.info.distribution, h, arg.k);
+
+        if (!writetableinfo(&arg.info, buf)) {
+                LOG("gendata_h48_derive: could not write info for table\n");
+                goto gendata_h48_derive_error;
+        }
+
+gendata_h48_derive_return_size:
+        return cocsepsize + h48size;
+
+gendata_h48_derive_error:
+        return 0;
+}