4 files changed, 122 insertions, 113 deletions

diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index e8ffee3..2a62b1d 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -344,7 +344,7 @@ gendata_h48k2(gendata_h48_arg_t *arg)
 
         uint8_t t, selectedbase, *table;
         int64_t j;
-        uint64_t nshort, i, ii, inext, count;
+        uint64_t i, ii, inext, count;
         h48map_t shortcubes;
         gendata_h48short_arg_t shortarg;
         h48k2_dfs_arg_t dfsarg[THREADS];
@@ -367,8 +367,7 @@ gendata_h48k2(gendata_h48_arg_t *arg)
                 .selfsim = arg->selfsim,
                 .map = &shortcubes
         };
-        nshort = gendata_h48short(&shortarg);
-        LOG("Cubes in <= %" PRIu8 " moves: %" PRIu64 "\n", shortdepth, nshort);
+        gendata_h48short(&shortarg);
 
         selectedbase = base[arg->h];
         arg->info = (tableinfo_t) {
@@ -434,6 +433,7 @@ gendata_h48k2_return_size:
 STATIC void *
 gendata_h48k2_runthread(void *arg)
 {
+        uint64_t count, coord, mutex;
         kvpair_t kv;
         h48k2_dfs_arg_t *dfsarg;
 
@@ -447,15 +447,22 @@ gendata_h48k2_runthread(void *arg)
                         pthread_mutex_unlock(dfsarg->shortcubes_mutex);
                         break;
                 }
-                (*dfsarg->count)++;
-                if (*dfsarg->count % UINT64_C(1000000) == 0)
-                        LOG("Processing %" PRIu64 "th short cube\n",
-                            *dfsarg->count);
-
+                count = ++(*dfsarg->count);
                 pthread_mutex_unlock(dfsarg->shortcubes_mutex);
 
-                dfsarg->cube = invcoord_h48(kv.key, dfsarg->crep, 11);
-                gendata_h48k2_dfs(dfsarg);
+                if (count % UINT64_C(1000000) == 0)
+                        LOG("Processing %" PRIu64 "th short cube\n", count);
+
+                if (kv.val < dfsarg->shortdepth) {
+                        coord = kv.key >> (int64_t)(11 - dfsarg->h);
+                        mutex = H48_INDEX(coord, dfsarg->k) % CHUNKS;
+                        pthread_mutex_lock(dfsarg->table_mutex[mutex]);
+                        set_h48_pval(dfsarg->table, coord, dfsarg->k, 0);
+                        pthread_mutex_unlock(dfsarg->table_mutex[mutex]);
+                } else {
+                        dfsarg->cube = invcoord_h48(kv.key, dfsarg->crep, 11);
+                        gendata_h48k2_dfs(dfsarg);
+                }
         }
 
         return NULL;
@@ -524,16 +531,17 @@ STATIC_INLINE void
 gendata_h48k2_mark(cube_t cube, int8_t depth, h48k2_dfs_arg_t *arg)
 {
         uint8_t oldval, newval;
-        int64_t coord, fullcoord;
+        int64_t coord, fullcoord, mutex;
 
         FOREACH_H48SIM(cube, arg->cocsepdata, arg->selfsim,
                 fullcoord = coord_h48(cube, arg->cocsepdata, 11);
                 coord = fullcoord >> (int64_t)(11 - arg->h);
-                pthread_mutex_lock(arg->table_mutex[coord % CHUNKS]);
+                mutex = H48_INDEX(coord, arg->k) % CHUNKS;
+                pthread_mutex_lock(arg->table_mutex[mutex]);
                 oldval = get_h48_pval(arg->table, coord, arg->k);
                 newval = (uint8_t)MAX(depth, 0);
                 set_h48_pval(arg->table, coord, arg->k, MIN(oldval, newval));
-                pthread_mutex_unlock(arg->table_mutex[coord % CHUNKS]);
+                pthread_mutex_unlock(arg->table_mutex[mutex]);
         )
 }
 
diff --git a/src/solvers/h48/h48.h b/src/solvers/h48/h48.h
index ee865d9..2fe9575 100644
--- a/src/solvers/h48/h48.h
+++ b/src/solvers/h48/h48.h
@@ -2,5 +2,6 @@
 #include "map.h"
 #include "gendata_cocsep.h"
 #include "gendata_h48.h"
+#include "stats.h"
 #include "solve.h"
 #include "thread.h"
diff --git a/src/solvers/h48/solve.h b/src/solvers/h48/solve.h
index 4bf55ca..b67aedc 100644
--- a/src/solvers/h48/solve.h
+++ b/src/solvers/h48/solve.h
@@ -16,16 +16,6 @@ typedef struct {
         uint8_t premoves[MAXLEN];
 } dfsarg_solveh48_t;
 
-typedef struct {
-        cube_t cube;
-        int8_t nmoves;
-        int8_t depth;
-        uint8_t moves[MAXLEN];
-        uint32_t *cocsepdata;
-        uint8_t *h48data;
-        char *s;
-} dfsarg_solveh48stats_t;
-
 STATIC uint32_t allowednextmove_h48(uint8_t *, uint8_t, uint32_t);
 
 STATIC void solve_h48_appendsolution(dfsarg_solveh48_t *);
@@ -33,9 +23,6 @@ STATIC_INLINE bool solve_h48_stop(dfsarg_solveh48_t *);
 STATIC int64_t solve_h48_dfs(dfsarg_solveh48_t *);
 STATIC int64_t solve_h48(cube_t, int8_t, int8_t, int8_t, const void *, char *);
 
-STATIC int64_t solve_h48stats_dfs(dfsarg_solveh48stats_t *);
-STATIC int64_t solve_h48stats(cube_t, int8_t, const void *, char [static 12]);
-
 STATIC uint32_t
 allowednextmove_h48(uint8_t *moves, uint8_t n, uint32_t h48branch)
 {
@@ -215,90 +202,3 @@ solve_h48(
 
         return nsols;
 }
-
-/*
-The h48stats solver computes how many moves it takes to solve to
-each of the 12 h48 coordinates, one for each value of h from 0 to 11.
-The solutions array is filled with the length of the solutions. The
-solution array is therefore not a printable string.
-*/
-STATIC int64_t
-solve_h48stats_dfs(dfsarg_solveh48stats_t *arg)
-{
-        const int64_t limit = 11;
-
-        int8_t bound, u;
-        uint8_t m;
-        uint32_t d;
-        int64_t coord, h;
-        dfsarg_solveh48stats_t nextarg;
-
-        /* Check cocsep lower bound (corners only) */
-        bound = get_h48_cdata(arg->cube, arg->cocsepdata, &d);
-        if (bound + arg->nmoves > arg->depth)
-                return 0;
-
-        /* Check h48 lower bound for h=0 (esep, but no eo) */
-        coord = coord_h48_edges(arg->cube, COCLASS(d), TTREP(d), 0);
-        bound = get_h48_bound(arg->cube, d, 0, 4, arg->h48data);
-        if (bound + arg->nmoves > arg->depth)
-                return 0;
-        
-        /* Update all other values, if solved */
-        coord = coord_h48_edges(arg->cube, COCLASS(d), TTREP(d), 11);
-        for (h = 0; h <= limit; h++) {
-                u = coord >> (11-h) == 0 && arg->s[h] == 99;
-                arg->s[h] = u * arg->nmoves + (1-u) * arg->s[h];
-        }
-
-        if (arg->s[limit] != 99)
-                return 0;
-
-        nextarg = *arg;
-        nextarg.nmoves = arg->nmoves + 1;
-        for (m = 0; m < 18; m++) {
-                nextarg.moves[arg->nmoves] = m;
-                if (!allowednextmove(nextarg.moves, nextarg.nmoves)) {
-                        /* If a move is not allowed, neither are its 180
-                         * and 270 degree variations */
-                        m += 2;
-                        continue;
-                }
-                nextarg.cube = move(arg->cube, m);
-                solve_h48stats_dfs(&nextarg);
-        }
-
-        return 0;
-}
-
-STATIC int64_t
-solve_h48stats(
-        cube_t cube,
-        int8_t maxmoves,
-        const void *data,
-        char solutions[static 12]
-)
-{
-        int i;
-        dfsarg_solveh48stats_t arg;
-
-        arg = (dfsarg_solveh48stats_t) {
-                .cube = cube,
-                .cocsepdata = get_cocsepdata_ptr(data),
-                .h48data = get_h48data_ptr(data),
-                .s = solutions
-        };
-
-        for (i = 0; i < 12; i++)
-                solutions[i] = (char)99;
-
-        for (arg.depth = 0;
-             arg.depth <= maxmoves && solutions[11] == 99;
-             arg.depth++)
-        {
-                arg.nmoves = 0;
-                solve_h48stats_dfs(&arg);
-        }
-
-        return 0;
-}
diff --git a/src/solvers/h48/stats.h b/src/solvers/h48/stats.h
new file mode 100644
index 0000000..6e78ab5
--- /dev/null
+++ b/src/solvers/h48/stats.h
@@ -0,0 +1,100 @@
+/*
+The h48stats solver computes how many moves it takes to solve to
+each of the 12 h48 coordinates, one for each value of h from 0 to 11.
+The solutions array is filled with the length of the solutions. The
+solutions array is therefore not a printable string.
+*/
+
+typedef struct {
+        cube_t cube;
+        int8_t nmoves;
+        int8_t depth;
+        uint8_t moves[MAXLEN];
+        uint32_t *cocsepdata;
+        uint8_t *h48data;
+        char *s;
+} dfsarg_solveh48stats_t;
+
+STATIC int64_t solve_h48stats_dfs(dfsarg_solveh48stats_t *);
+STATIC int64_t solve_h48stats(cube_t, int8_t, const void *, char [static 12]);
+
+STATIC int64_t
+solve_h48stats_dfs(dfsarg_solveh48stats_t *arg)
+{
+        const int64_t limit = 11;
+
+        int8_t bound, u;
+        uint8_t m;
+        uint32_t d;
+        int64_t coord, h;
+        dfsarg_solveh48stats_t nextarg;
+
+        /* Check cocsep lower bound (corners only) */
+        bound = get_h48_cdata(arg->cube, arg->cocsepdata, &d);
+        if (bound + arg->nmoves > arg->depth)
+                return 0;
+
+        /* Check h48 lower bound for h=0 (esep, but no eo) */
+        coord = coord_h48_edges(arg->cube, COCLASS(d), TTREP(d), 0);
+        bound = get_h48_bound(arg->cube, d, 0, 4, arg->h48data);
+        if (bound + arg->nmoves > arg->depth)
+                return 0;
+        
+        /* Update all other values, if solved */
+        coord = coord_h48_edges(arg->cube, COCLASS(d), TTREP(d), 11);
+        for (h = 0; h <= limit; h++) {
+                u = coord >> (11-h) == 0 && arg->s[h] == 99;
+                arg->s[h] = u * arg->nmoves + (1-u) * arg->s[h];
+        }
+
+        if (arg->s[limit] != 99)
+                return 0;
+
+        nextarg = *arg;
+        nextarg.nmoves = arg->nmoves + 1;
+        for (m = 0; m < 18; m++) {
+                nextarg.moves[arg->nmoves] = m;
+                if (!allowednextmove(nextarg.moves, nextarg.nmoves)) {
+                        /* If a move is not allowed, neither are its 180
+                         * and 270 degree variations */
+                        m += 2;
+                        continue;
+                }
+                nextarg.cube = move(arg->cube, m);
+                solve_h48stats_dfs(&nextarg);
+        }
+
+        return 0;
+}
+
+STATIC int64_t
+solve_h48stats(
+        cube_t cube,
+        int8_t maxmoves,
+        const void *data,
+        char solutions[static 12]
+)
+{
+        int i;
+        dfsarg_solveh48stats_t arg;
+
+        arg = (dfsarg_solveh48stats_t) {
+                .cube = cube,
+                .cocsepdata = get_cocsepdata_ptr(data),
+                .h48data = get_h48data_ptr(data),
+                .s = solutions
+        };
+
+        for (i = 0; i < 12; i++)
+                solutions[i] = (char)99;
+
+        for (arg.depth = 0;
+             arg.depth <= maxmoves && solutions[11] == 99;
+             arg.depth++)
+        {
+                arg.nmoves = 0;
+                solve_h48stats_dfs(&arg);
+        }
+
+        return 0;
+}