1 files changed, 21 insertions, 13 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]);
         )
 }