aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/solvers/h48/checkdata.h74
-rw-r--r--src/solvers/h48/gendata_h48.h2
-rw-r--r--utils/egg-tables140
3 files changed, 178 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 {
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 }
diff --git a/utils/egg-tables b/utils/egg-tables
new file mode 100644
index 0000000..d331e59
--- /dev/null
+++ b/utils/egg-tables
@@ -0,0 +1,140 @@
1Table distribution generated by egg-solver (https://github.com/ArhanChaudhary/egg-solver)
2
3[gen] h0 base 7: 0.03 GiB, 16 threads
4[gen h0] depth 0: 1 entries
5[gen h0] depth 1: 1 entries (forward, 0.0s step, 0.0s total)
6[gen h0] depth 2: 4 entries (forward, 0.0s step, 0.0s total)
7[gen h0] depth 3: 34 entries (forward, 0.0s step, 0.0s total)
8[gen h0] depth 4: 331 entries (forward, 0.0s step, 0.0s total)
9[gen h0] depth 5: 3612 entries (forward, 0.0s step, 0.0s total)
10[gen h0] depth 6: 41605 entries (forward, 0.0s step, 0.0s total)
11[gen h0] depth 7: 474128 entries (forward, 0.0s step, 0.1s total)
12[gen h0] depth 8: 4953846 entries (forward, 0.0s step, 0.1s total)
13[gen h0] depth 9: 34776317 entries (forward, 0.1s step, 0.2s total)
14h0 base 7 distribution [519716, 4953846, 34776317, 77317571]
15
16[gen] h1 base 8: 0.06 GiB, 16 threads
17[gen] prefix depth 1: 1 h11 entries
18[gen] prefix depth 2: 4 h11 entries
19[gen] prefix depth 3: 34 h11 entries
20[gen] prefix depth 4: 333 h11 entries
21[gen] prefix depth 5: 3815 h11 entries
22[gen] prefix depth 6: 45382 h11 entries
23[gen] prefix depth 7: 548562 h11 entries
24[gen] prefix depth 8: 6839723 h11 entries
25h1 base 8 distribution [6012079, 45822302, 142018732, 41281787]
26
27[gen] h2 base 8: 0.11 GiB, 16 threads
28[gen] prefix depth 1: 1 h11 entries
29[gen] prefix depth 2: 4 h11 entries
30[gen] prefix depth 3: 34 h11 entries
31[gen] prefix depth 4: 333 h11 entries
32[gen] prefix depth 5: 3815 h11 entries
33[gen] prefix depth 6: 45382 h11 entries
34[gen] prefix depth 7: 548562 h11 entries
35[gen] prefix depth 8: 6839723 h11 entries
36h2 base 8 distribution [6391286, 55494787, 252389935, 155993792]
37
38[gen] h3 base 8: 0.23 GiB, 16 threads
39[gen] prefix depth 1: 1 h11 entries
40[gen] prefix depth 2: 4 h11 entries
41[gen] prefix depth 3: 34 h11 entries
42[gen] prefix depth 4: 333 h11 entries
43[gen] prefix depth 5: 3815 h11 entries
44[gen] prefix depth 6: 45382 h11 entries
45[gen] prefix depth 7: 548562 h11 entries
46[gen] prefix depth 8: 6839723 h11 entries
47h3 base 8 distribution [6686828, 63867855, 392789704, 477195213]
48
49[gen] h4 base 9: 0.45 GiB, 16 threads
50[gen] prefix depth 1: 1 h11 entries
51[gen] prefix depth 2: 4 h11 entries
52[gen] prefix depth 3: 34 h11 entries
53[gen] prefix depth 4: 333 h11 entries
54[gen] prefix depth 5: 3815 h11 entries
55[gen] prefix depth 6: 45382 h11 entries
56[gen] prefix depth 7: 548562 h11 entries
57[gen] prefix depth 8: 6839723 h11 entries
58h4 base 9 distribution [77147216, 543379445, 1139570223, 120982316]
59
60[gen] h5 base 9: 0.91 GiB, 16 threads
61[gen] prefix depth 1: 1 h11 entries
62[gen] prefix depth 2: 4 h11 entries
63[gen] prefix depth 3: 34 h11 entries
64[gen] prefix depth 4: 333 h11 entries
65[gen] prefix depth 5: 3815 h11 entries
66[gen] prefix depth 6: 45382 h11 entries
67[gen] prefix depth 7: 548562 h11 entries
68[gen] prefix depth 8: 6839723 h11 entries
69h5 base 9 distribution [82471289, 687850794, 2345840739, 645995578]
70
71[gen] h6 base 9: 1.81 GiB, 16 threads
72[gen] prefix depth 1: 1 h11 entries
73[gen] prefix depth 2: 4 h11 entries
74[gen] prefix depth 3: 34 h11 entries
75[gen] prefix depth 4: 333 h11 entries
76[gen] prefix depth 5: 3815 h11 entries
77[gen] prefix depth 6: 45382 h11 entries
78[gen] prefix depth 7: 548562 h11 entries
79[gen] prefix depth 8: 6839723 h11 entries
80h6 base 9 distribution [85941105, 804753057, 4077248291, 2556374347]
81
82[gen] h7 base 9: 3.62 GiB, 16 threads
83[gen] prefix depth 1: 1 h11 entries
84[gen] prefix depth 2: 4 h11 entries
85[gen] prefix depth 3: 34 h11 entries
86[gen] prefix depth 4: 333 h11 entries
87[gen] prefix depth 5: 3815 h11 entries
88[gen] prefix depth 6: 45382 h11 entries
89[gen] prefix depth 7: 548562 h11 entries
90[gen] prefix depth 8: 6839723 h11 entries
91h7 base 9 distribution [88529771, 897323586, 6126261227, 7936519016]
92
93[gen] h8 base 10: 7.25 GiB, 16 threads
94[gen] prefix depth 1: 1 h11 entries
95[gen] prefix depth 2: 4 h11 entries
96[gen] prefix depth 3: 34 h11 entries
97[gen] prefix depth 4: 333 h11 entries
98[gen] prefix depth 5: 3815 h11 entries
99[gen] prefix depth 6: 45382 h11 entries
100[gen] prefix depth 7: 548562 h11 entries
101[gen] prefix depth 8: 6839723 h11 entries
102h8 base 10 distribution [1051580076, 8136022157, 19024479157, 1885185810]
103
104[gen] h9 base 10: 14.50 GiB, 16 threads
105[gen] prefix depth 1: 1 h11 entries
106[gen] prefix depth 2: 4 h11 entries
107[gen] prefix depth 3: 34 h11 entries
108[gen] prefix depth 4: 333 h11 entries
109[gen] prefix depth 5: 3815 h11 entries
110[gen] prefix depth 6: 45382 h11 entries
111[gen] prefix depth 7: 548562 h11 entries
112[gen] prefix depth 8: 6839723 h11 entries
113h9 base 10 distribution [1102038343, 9888266493, 38299376032, 10904853532]
114
115[gen] h10 base 10: 28.99 GiB, 16 threads
116[gen] prefix depth 1: 1 h11 entries
117[gen] prefix depth 2: 4 h11 entries
118[gen] prefix depth 3: 34 h11 entries
119[gen] prefix depth 4: 333 h11 entries
120[gen] prefix depth 5: 3815 h11 entries
121[gen] prefix depth 6: 45382 h11 entries
122[gen] prefix depth 7: 548562 h11 entries
123[gen] prefix depth 8: 6839723 h11 entries
124h10 base 10 distribution [1133240200, 11196287163, 64164706157, 43894835280]
125
126[gen] h11 base 10: 57.99 GiB, 16 threads
127[gen h11] depth 0: 1 entries
128[gen h11] depth 1: 1 entries (forward, 1.5s step, 12.0s total)
129[gen h11] depth 2: 4 entries (forward, 1.2s step, 15.6s total)
130[gen h11] depth 3: 34 entries (forward, 1.2s step, 19.1s total)
131[gen h11] depth 4: 333 entries (forward, 1.2s step, 22.6s total)
132[gen h11] depth 5: 3815 entries (forward, 1.2s step, 26.1s total)
133[gen h11] depth 6: 45382 entries (forward, 1.2s step, 29.7s total)
134[gen h11] depth 7: 548562 entries (forward, 1.2s step, 33.2s total)
135[gen h11] depth 8: 6839723 entries (forward, 1.2s step, 36.7s total)
136[gen h11] depth 9: 85659526 entries (forward, 1.5s step, 40.6s total)
137[gen h11] depth 10: 1057665939 entries (forward, 6.8s step, 49.8s total)
138[gen h11] depth 11: 12045847349 entries (forward, 69.6s step, 121.9s total)
139[gen h11] depth 12: 91163441021 entries (forward, 638.1s step, 761.7s total)
140h11 base 10 distribution [1150763320, 12045847349, 91163441021, 136418085910]

Generated with cgit - Back to sebastiano.tronto.net