Merge branch 'master' of tronto.net:h48

3 files changed, 25 insertions, 12 deletions

diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index 2d222c9..fbb8b35 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -1,6 +1,7 @@
 #define H48_COORDMAX_NOEO    ((int64_t)(COCSEP_CLASSES * _12c4 * _8c4))
 #define H48_COORDMAX(h)      ((int64_t)(H48_COORDMAX_NOEO << (int64_t)(h)))
-#define H48_TABLESIZE(h, k)  ((size_t)H48_COORDMAX((h)) / ((size_t)8 / (size_t)(k)))
+#define H48_DIV(k)           ((size_t)8 / (size_t)(k))
+#define H48_TABLESIZE(h, k)  _div_round_up((size_t)H48_COORDMAX((h)), H48_DIV(k))
 
 #define H48_COEFF(k)         (UINT32_C(32) / (uint32_t)(k))
 #define H48_INDEX(i, k)      ((uint32_t)(i) / H48_COEFF(k))
@@ -140,7 +141,7 @@ gendata_h48(gendata_h48_arg_t *arg)
         cocsepsize = gendata_cocsep(
             (void *)arg->cocsepdata, arg->selfsim, arg->crep);
         arg->h48data = arg->cocsepdata + (cocsepsize / sizeof(uint32_t));
-        arg->info = arg->h48data +
+        arg->info = arg->h48data + 1 +
             (H48_TABLESIZE(arg->h, arg->k) / sizeof(uint32_t));
 
         if (arg->buf != NULL)
@@ -341,18 +342,27 @@ gendata_h48k2(gendata_h48_arg_t *arg)
         };
 
         i = 0;
+int jj = 0;
         for (kv = h48map_nextkvpair(&shortcubes, &i);
              i != shortcubes.capacity;
              kv = h48map_nextkvpair(&shortcubes, &i)
         ) {
-                /* TODO maybe over all sim? */
                 dfsarg.cube = invcoord_h48(kv.key, arg->crep, 11);
+
+#if 1
                 gendata_h48k2_dfs(&dfsarg);
+#else
+                /* It looks like this is not necessary, we get the same result */
+                _foreach_h48sim(
+                        dfsarg.cube, arg->cocsepdata, arg->selfsim, arg->h,
+                        gendata_h48k2_dfs(&dfsarg);
+                )
+#endif
+if ((++jj) % 1000 == 0) LOG("Done %d distance 8 cubes\n", jj);
         }
 
         h48map_destroy(&shortcubes);
 
-        /* TODO: move info update to dfs? */
         memset(arg->info, 0, 5 * sizeof(arg->info[0]));
         arg->info[0] = base[arg->k];
         for (j = 0; j < H48_COORDMAX(arg->h); j++) {
@@ -367,7 +377,7 @@ gendata_h48k2_return_size:
 _static void
 gendata_h48k2_dfs(h48k2_dfs_arg_t *arg)
 {
-        uint8_t nmoves;
+        uint8_t nmoves, oldval, newval;
         uint64_t val;
         int64_t coord, fullcoord;
         h48k2_dfs_arg_t nextarg;
@@ -378,12 +388,13 @@ gendata_h48k2_dfs(h48k2_dfs_arg_t *arg)
 
         val = h48map_value(arg->shortcubes, fullcoord);
 
-        if (arg->depth >= arg->base && arg->depth <= arg->base + 2)
-                set_esep_pval(
-                    arg->h48data, coord, arg->k, arg->depth - arg->base);
+        if (arg->depth >= arg->base && arg->depth <= arg->base + 2) {
+                oldval = get_esep_pval(arg->h48data, coord, arg->k);
+                newval = _min(oldval, arg->depth - arg->base);
+                set_esep_pval(arg->h48data, coord, arg->k, newval);
+        }
 
-        if ((val < arg->shortdepth) ||
-            (arg->depth > arg->shortdepth && val != MAP_UNSET) ||
+        if ((arg->depth > arg->shortdepth && val != MAP_UNSET_VAL) ||
             (arg->depth >= arg->maxdepth || arg->depth >= arg->base + 2))
                 return;
 
diff --git a/src/solvers/h48/map.h b/src/solvers/h48/map.h
index 82e5a2c..0e9f926 100644
--- a/src/solvers/h48/map.h
+++ b/src/solvers/h48/map.h
@@ -1,6 +1,7 @@
 #define MAP_UNSET             UINT64_C(0xFFFFFFFFFFFFFFFF)
 #define MAP_KEYMASK           UINT64_C(0xFFFFFFFFFF)
 #define MAP_KEYSHIFT          UINT64_C(40)
+#define MAP_UNSET_VAL         (MAP_UNSET >> MAP_KEYSHIFT)
 
 typedef struct {
         uint64_t n;
@@ -84,8 +85,8 @@ h48map_nextkvpair(h48map_t *map, uint64_t *p)
         kvpair_t kv;
         uint64_t pair;
 
-        kv.key = MAP_UNSET;
-        kv.val = MAP_UNSET;
+        kv.key = MAP_KEYMASK;
+        kv.val = MAP_UNSET_VAL;
 
         DBG_ASSERT(*p < map->capacity, kv,
             "Error looping over map: given index %" PRIu64 " is out of "
diff --git a/src/utils/math.h b/src/utils/math.h
index 87402e6..a361808 100644
--- a/src/utils/math.h
+++ b/src/utils/math.h
@@ -1,6 +1,7 @@
 #define _swap(x, y) do { x ^= y; y ^= x; x ^= y; } while (0)
 #define _min(x, y) ((x) < (y) ? (x) : (y))
 #define _max(x, y) ((x) > (y) ? (x) : (y))
+#define _div_round_up(n, d) (((n) + (d) - 1) / (d))
 
 _static int64_t factorial(int64_t);
 _static bool isperm(uint8_t *, int64_t);