2 files changed, 38 insertions, 38 deletions
diff --git a/src/solvers/h48/checkdata.h b/src/solvers/h48/checkdata.h
index e2fa38c..749cfc7 100644
--- a/src/solvers/h48/checkdata.h
+++ b/src/solvers/h48/checkdata.h
@@ -43,90 +43,90 @@ struct {
                .max = 3,
                .table = {
                        [0] = 6391286,
-                        [1] = 55494785,
+                        [1] = 55494787,
                        [2] = 252389935,
-                        [3] = 155993794,
+                        [3] = 155993792,
                },
        },
        [3] = {
                .max = 3,
                .table = {
                        [0] = 6686828,
-                        [1] = 63867852,
+                        [1] = 63867855,
-                        [2] = 392789689,
+                        [2] = 392789704,
-                        [3] = 477195231,
+                        [3] = 477195213,
                },
        },
        [4] = {
                .max = 3,
                .table = {
-                        [0] = 77147213,
+                        [0] = 77147216,
-                        [1] = 543379415,
+                        [1] = 543379445,
-                        [2] = 1139570251,
+                        [2] = 1139570223,
-                        [3] = 120982321,
+                        [3] = 120982316,
                },
        },
        [5] = {
                .max = 3,
                .table = {
-                        [0] = 82471284,
+                        [0] = 82471289,
-                        [1] = 687850732,
+                        [1] = 687850794,
-                        [2] = 2345840746,
+                        [2] = 2345840739,
-                        [3] = 645995638,
+                        [3] = 645995578,
                },
        },
        [6] = {
                .max = 3,
                .table = {
-                        [0] = 85941099,
+                        [0] = 85941105,
-                        [1] = 804752968,
+                        [1] = 80475305,
-                        [2] = 4077248182,
+                        [2] = 4077248291,
-                        [3] = 2556374551,
+                        [3] = 2556374347,
                },
        },
        [7] = {
                .max = 3,
                .table = {
-                        [0] = 88529761,
+                        [0] = 88529771,
-                        [1] = 897323475,
+                        [1] = 897323586,
-                        [2] = 6126260791,
+                        [2] = 6126261227,
-                        [3] = 7936519573,
+                        [3] = 7936519016,
                },
        },
        [8] = {
                .max = 3,
                .table = {
-                        [0] = 1051579940,
+                        [0] = 1051580076,
-                        [1] = 8136021316,
+                        [1] = 8136022157,
-                        [2] = 19024479822,
+                        [2] = 19024479157,
-                        [3] = 1885186122,
+                        [3] = 1885185810,
                },
        },
        [9] = {
                .max = 3,
                .table = {
-                        [0] = 1102038189,
+                        [0] = 1102038343,
-                        [1] = 9888265242,
+                        [1] = 9888266493,
-                        [2] = 38299375805,
+                        [2] = 38299376032,
-                        [3] = 10904855164,
+                        [3] = 10904853532,
                },
        },
        [10] = {
                .max = 3,
                .table = {
-                        [0] = 1133240039,
+                        [0] = 1133240200,
-                        [1] = 11196285614,
+                        [1] = 11196287163,
-                        [2] = 64164702961,
+                        [2] = 64164706157,
-                        [3] = 43894840186,
+                        [3] = 43894835280,
                },
        },
        [11] = {
                .max = 3,
                .table = {
-                        [0] = 1150763161,
+                        [0] = 1150763320,
-                        [1] = 12045845660,
+                        [1] = 12045847349,
-                        [2] = 91163433330,
+                        [2] = 91163441021,
-                        [3] = 136418095449,
+                        [3] = 136418085910,
                },
        },
 };
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index 0b85e49..be06588 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -308,7 +308,7 @@ gendata_h48_runthread(void *arg)
                wrapthread_mutex_lock(dfsarg->shortcubes_mutex);
                kv = h48map_nextkvpair(dfsarg->shortcubes, dfsarg->next);
-                if (*dfsarg->next == dfsarg->shortcubes->capacity) {
+                if (kv.val == MAP_UNSET_VAL) {
                        wrapthread_mutex_unlock(dfsarg->shortcubes_mutex);
                        break;
                }

diff --git a/src/solvers/h48/checkdata.h b/src/solvers/h48/checkdata.h index e2fa38c..749cfc7 100644 --- a/src/solvers/h48/checkdata.h +++ b/src/solvers/h48/checkdata.h
@@ -43,90 +43,90 @@ struct {
43	.max = 3,	43	.max = 3,
44	.table = {	44	.table = {
45	[0] = 6391286,	45	[0] = 6391286,
46	[1] = 55494785,	46	[1] = 55494787,
47	[2] = 252389935,	47	[2] = 252389935,
48	[3] = 155993794,	48	[3] = 155993792,
49	},	49	},
50	},	50	},
51	[3] = {	51	[3] = {
52	.max = 3,	52	.max = 3,
53	.table = {	53	.table = {
54	[0] = 6686828,	54	[0] = 6686828,
55	[1] = 63867852,	55	[1] = 63867855,
56	[2] = 392789689,	56	[2] = 392789704,
57	[3] = 477195231,	57	[3] = 477195213,
58	},	58	},
59	},	59	},
60	[4] = {	60	[4] = {
61	.max = 3,	61	.max = 3,
62	.table = {	62	.table = {
63	[0] = 77147213,	63	[0] = 77147216,
64	[1] = 543379415,	64	[1] = 543379445,
65	[2] = 1139570251,	65	[2] = 1139570223,
66	[3] = 120982321,	66	[3] = 120982316,
67	},	67	},
68	},	68	},
69	[5] = {	69	[5] = {
70	.max = 3,	70	.max = 3,
71	.table = {	71	.table = {
72	[0] = 82471284,	72	[0] = 82471289,
73	[1] = 687850732,	73	[1] = 687850794,
74	[2] = 2345840746,	74	[2] = 2345840739,
75	[3] = 645995638,	75	[3] = 645995578,
76	},	76	},
77	},	77	},
78	[6] = {	78	[6] = {
79	.max = 3,	79	.max = 3,
80	.table = {	80	.table = {
81	[0] = 85941099,	81	[0] = 85941105,
82	[1] = 804752968,	82	[1] = 80475305,
83	[2] = 4077248182,	83	[2] = 4077248291,
84	[3] = 2556374551,	84	[3] = 2556374347,
85	},	85	},
86	},	86	},
87	[7] = {	87	[7] = {
88	.max = 3,	88	.max = 3,
89	.table = {	89	.table = {
90	[0] = 88529761,	90	[0] = 88529771,
91	[1] = 897323475,	91	[1] = 897323586,
92	[2] = 6126260791,	92	[2] = 6126261227,
93	[3] = 7936519573,	93	[3] = 7936519016,
94	},	94	},
95	},	95	},
96	[8] = {	96	[8] = {
97	.max = 3,	97	.max = 3,
98	.table = {	98	.table = {
99	[0] = 1051579940,	99	[0] = 1051580076,
100	[1] = 8136021316,	100	[1] = 8136022157,
101	[2] = 19024479822,	101	[2] = 19024479157,
102	[3] = 1885186122,	102	[3] = 1885185810,
103	},	103	},
104	},	104	},
105	[9] = {	105	[9] = {
106	.max = 3,	106	.max = 3,
107	.table = {	107	.table = {
108	[0] = 1102038189,	108	[0] = 1102038343,
109	[1] = 9888265242,	109	[1] = 9888266493,
110	[2] = 38299375805,	110	[2] = 38299376032,
111	[3] = 10904855164,	111	[3] = 10904853532,
112	},	112	},
113	},	113	},
114	[10] = {	114	[10] = {
115	.max = 3,	115	.max = 3,
116	.table = {	116	.table = {
117	[0] = 1133240039,	117	[0] = 1133240200,
118	[1] = 11196285614,	118	[1] = 11196287163,
119	[2] = 64164702961,	119	[2] = 64164706157,
120	[3] = 43894840186,	120	[3] = 43894835280,
121	},	121	},
122	},	122	},
123	[11] = {	123	[11] = {
124	.max = 3,	124	.max = 3,
125	.table = {	125	.table = {
126	[0] = 1150763161,	126	[0] = 1150763320,
127	[1] = 12045845660,	127	[1] = 12045847349,
128	[2] = 91163433330,	128	[2] = 91163441021,
129	[3] = 136418095449,	129	[3] = 136418085910,
130	},	130	},
131	},	131	},
132	};	132	};


diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h index 0b85e49..be06588 100644 --- a/src/solvers/h48/gendata_h48.h +++ b/src/solvers/h48/gendata_h48.h
@@ -308,7 +308,7 @@ gendata_h48_runthread(void *arg)
308	wrapthread_mutex_lock(dfsarg->shortcubes_mutex);	308	wrapthread_mutex_lock(dfsarg->shortcubes_mutex);
309		309
310	kv = h48map_nextkvpair(dfsarg->shortcubes, dfsarg->next);	310	kv = h48map_nextkvpair(dfsarg->shortcubes, dfsarg->next);
311	if (*dfsarg->next == dfsarg->shortcubes->capacity) {	311	if (kv.val == MAP_UNSET_VAL) {
312	wrapthread_mutex_unlock(dfsarg->shortcubes_mutex);	312	wrapthread_mutex_unlock(dfsarg->shortcubes_mutex);
313	break;	313	break;
314	}	314	}