tour/puzzle-generator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

introduce bitloops

Browse Source
This commit is contained in:
mike
2026-01-14 11:37:40 +01:00
parent c1706e1bf7
commit 8e049b3fa5
3 changed files with 62 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/puzzle/Export.java
View File

@@ -107,9 +107,7 @@ public record Export() {
}).limit(Long.bitCount(lo))); }).limit(Long.bitCount(lo)));
} }
} }
//public boolean isLetterSet(int idx) { return isLetter(g[idx]); } char NOT_CLUE_NOT_LETTER_TO(byte b) {
char NOT_CLUE_NOT_LETTER_TO(byte b, char fallback) {
if (b == SwedishGenerator.DASH) throw new RuntimeException();
return (char) (64 | b); return (char) (64 | b);
} }
String gridToString(Clues clues) { String gridToString(Clues clues) {
@@ -146,7 +144,7 @@ public record Export() {
if (clues.isClue(offset)) { if (clues.isClue(offset)) {
sb.append(clueChar.replace(new Cell(grid, clues, offset, clues.digitAt(offset)))); sb.append(clueChar.replace(new Cell(grid, clues, offset, clues.digitAt(offset))));
} else if (grid.lisLetterAt(offset)) { } else if (grid.lisLetterAt(offset)) {
sb.append(NOT_CLUE_NOT_LETTER_TO(grid.letter32At(offset), emptyFallback)); sb.append(NOT_CLUE_NOT_LETTER_TO(grid.letter32At(offset)));
} else { } else {
sb.append(emptyFallback); sb.append(emptyFallback);
} }

75
src/main/java/puzzle/SwedishGenerator.java
View File

@@ -441,7 +441,6 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
} }
visitor.visit(key, rayLo, rayHi); visitor.visit(key, rayLo, rayHi);
//if ((rayLo | rayHi) == 0L) throw new RuntimeException()
} }
static Slot[] extractSlots(Clues grid) { static Slot[] extractSlots(Clues grid) {
@@ -733,37 +732,38 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
return best.grid; return best.grid;
} }
static long patternForSlot(Grid grid, Slot s) { static long patternForSlot(Grid grid, final int key, final long lo, final long hi) {
if ((s.lo & grid.lo) == 0 && (s.hi & grid.hi) == 0) { final long glo = grid.lo, ghi = grid.hi;
if ((lo & glo) == 0 && (hi & ghi) == 0) {
return 0; return 0;
} }
long p = 0; long p = 0;
if (s.increasing()) { if (Slot.increasing(key)) {
for (long b = s.lo & grid.lo; b != 0; b &= b - 1) { for (long b = lo & glo; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
byte val = grid.g[idx]; byte val = grid.g[idx];
int i = Long.bitCount(s.lo & ((1L << idx) - 1)); int i = Long.bitCount(lo & ((1L << idx) - 1));
p |= ((long) (i * 26 + val)) << (i << 3); p |= ((long) (i * 26 + val)) << (i << 3);
} }
int offset = Long.bitCount(s.lo); int offset = Long.bitCount(lo);
for (long b = s.hi & grid.hi; b != 0; b &= b - 1) { for (long b = hi & ghi; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
byte val = grid.g[64 | idx]; byte val = grid.g[64 | idx];
int i = offset + Long.bitCount(s.hi & ((1L << idx) - 1)); int i = offset + Long.bitCount(hi & ((1L << idx) - 1));
p |= ((long) (i * 26 + val)) << (i << 3); p |= ((long) (i * 26 + val)) << (i << 3);
} }
} else { } else {
int offset = Long.bitCount(s.hi); int offset = Long.bitCount(hi);
for (long b = s.hi & grid.hi; b != 0; b &= b - 1) { for (long b = hi & ghi; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
byte val = grid.g[64 | idx]; byte val = grid.g[64 | idx];
int i = Long.bitCount(s.hi & ~((1L << idx) | ((1L << idx) - 1))); int i = Long.bitCount(hi & ~((1L << idx) | ((1L << idx) - 1)));
p |= ((long) (i * 26 + val)) << (i << 3); p |= ((long) (i * 26 + val)) << (i << 3);
} }
for (long b = s.lo & grid.lo; b != 0; b &= b - 1) { for (long b = lo & glo; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
byte val = grid.g[idx]; byte val = grid.g[idx];
int i = offset + Long.bitCount(s.lo & ~((1L << idx) | ((1L << idx) - 1))); int i = offset + Long.bitCount(lo & ~((1L << idx) | ((1L << idx) - 1)));
p |= ((long) (i * 26 + val)) << (i << 3); p |= ((long) (i * 26 + val)) << (i << 3);
} }
} }
@@ -775,51 +775,52 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
for (long b = s.hi; b != 0; b &= b - 1) cross += (count[64 | Long.numberOfTrailingZeros(b)] - 1); for (long b = s.hi; b != 0; b &= b - 1) cross += (count[64 | Long.numberOfTrailingZeros(b)] - 1);
return cross * 10 + s.length(); return cross * 10 + s.length();
} }
static boolean placeWord(Grid grid, Slot s, long w) { static boolean placeWord(Grid grid, final int key, final long lo, final long hi, final long w) {
if (s.increasing()) { final long glo = grid.lo, ghi = grid.hi;
for (long b = s.lo & grid.lo; b != 0; b &= b - 1) { if (Slot.increasing(key)) {
for (long b = lo & glo; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
if (grid.g[idx] != Lemma.byteAt(w, Long.bitCount(s.lo & ((1L << idx) - 1)))) return false; if (grid.g[idx] != Lemma.byteAt(w, Long.bitCount(lo & ((1L << idx) - 1)))) return false;
} }
int bcLo = Long.bitCount(s.lo); int bcLo = Long.bitCount(lo);
for (long b = s.hi & grid.hi; b != 0; b &= b - 1) { for (long b = hi & ghi; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
if (grid.g[64 | idx] != Lemma.byteAt(w, bcLo + Long.bitCount(s.hi & ((1L << idx) - 1)))) return false; if (grid.g[64 | idx] != Lemma.byteAt(w, bcLo + Long.bitCount(hi & ((1L << idx) - 1)))) return false;
} }
long maskLo = s.lo & ~grid.lo, maskHi = s.hi & ~grid.hi; long maskLo = lo & ~glo, maskHi = hi & ~ghi;
if ((maskLo | maskHi) != 0) { if ((maskLo | maskHi) != 0) {
for (long b = maskLo; b != 0; b &= b - 1) { for (long b = maskLo; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
grid.g[idx] = Lemma.byteAt(w, Long.bitCount(s.lo & ((1L << idx) - 1))); grid.g[idx] = Lemma.byteAt(w, Long.bitCount(lo & ((1L << idx) - 1)));
} }
for (long b = maskHi; b != 0; b &= b - 1) { for (long b = maskHi; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
grid.g[64 | idx] = Lemma.byteAt(w, bcLo + Long.bitCount(s.hi & ((1L << idx) - 1))); grid.g[64 | idx] = Lemma.byteAt(w, bcLo + Long.bitCount(hi & ((1L << idx) - 1)));
} }
grid.lo |= maskLo; grid.lo |= maskLo;
grid.hi |= maskHi; grid.hi |= maskHi;
} }
} else { } else {
int bcHi = Long.bitCount(s.hi); int bcHi = Long.bitCount(hi);
for (long b = s.hi & grid.hi; b != 0; b &= b - 1) { for (long b = hi & ghi; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
if (grid.g[64 | idx] != Lemma.byteAt(w, Long.bitCount(s.hi & ~((1L << idx) | ((1L << idx) - 1))))) return false; if (grid.g[64 | idx] != Lemma.byteAt(w, Long.bitCount(hi & ~((1L << idx) | ((1L << idx) - 1))))) return false;
} }
for (long b = s.lo & grid.lo; b != 0; b &= b - 1) { for (long b = lo & glo; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
if (grid.g[idx] != Lemma.byteAt(w, bcHi + Long.bitCount(s.lo & ~((1L << idx) | ((1L << idx) - 1))))) return false; if (grid.g[idx] != Lemma.byteAt(w, bcHi + Long.bitCount(lo & ~((1L << idx) | ((1L << idx) - 1))))) return false;
} }
long maskLo = s.lo & ~grid.lo, maskHi = s.hi & ~grid.hi; long maskLo = lo & ~glo, maskHi = hi & ~ghi;
if ((maskLo | maskHi) != 0) { if ((maskLo | maskHi) != 0) {
for (long b = maskHi; b != 0; b &= b - 1) { for (long b = maskHi; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
grid.g[64 | idx] = Lemma.byteAt(w, Long.bitCount(s.hi & ~((1L << idx) | ((1L << idx) - 1)))); grid.g[64 | idx] = Lemma.byteAt(w, Long.bitCount(hi & ~((1L << idx) | ((1L << idx) - 1))));
} }
for (long b = maskLo; b != 0; b &= b - 1) { for (long b = maskLo; b != 0; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
grid.g[idx] = Lemma.byteAt(w, bcHi + Long.bitCount(s.lo & ~((1L << idx) | ((1L << idx) - 1)))); grid.g[idx] = Lemma.byteAt(w, bcHi + Long.bitCount(lo & ~((1L << idx) | ((1L << idx) - 1))));
} }
grid.lo |= maskLo; grid.lo |= maskLo;
grid.hi |= maskHi; grid.hi |= maskHi;
@@ -946,7 +947,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
for (int i = 0, count, count2 = -1, bestScore = -1, n = TOTAL; i < n; i++) { for (int i = 0, count, count2 = -1, bestScore = -1, n = TOTAL; i < n; i++) {
var s = slots[i]; var s = slots[i];
if (assigned[s.key] != X) continue; if (assigned[s.key] != X) continue;
var pattern = patternForSlot(grid, s); var pattern = patternForSlot(grid, s.key, s.lo, s.hi);
var index = dictIndex[s.length()]; var index = dictIndex[s.length()];
count = pattern == X ? index.length : candidateCountForPattern(bitset, pattern, index.posBitsets, index.numlong); count = pattern == X ? index.length : candidateCountForPattern(bitset, pattern, index.posBitsets, index.numlong);
@@ -968,7 +969,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
current = PICK_DONE; current = PICK_DONE;
return; return;
} }
var pattern = patternForSlot(grid, best); var pattern = patternForSlot(grid, best.key, best.lo, best.hi);
var index = dictIndex[best.length()]; var index = dictIndex[best.length()];
current = CARRIER; current = CARRIER;
current.slot = best; current.slot = best;
@@ -1015,7 +1016,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
if (used.get(lemIdx)) continue; if (used.get(lemIdx)) continue;
val low = grid.lo; val low = grid.lo;
val top = grid.hi; val top = grid.hi;
if (!placeWord(grid, s, w)) continue; if (!placeWord(grid, k, s.lo, s.hi, w)) continue;
used.set(lemIdx); used.set(lemIdx);
assigned[k] = w; assigned[k] = w;
@@ -1024,7 +1025,6 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
assigned[k] = X; assigned[k] = X;
used.clear(lemIdx); used.clear(lemIdx);
//grid.undoPlace(undo[depth << 1], undo[(depth << 1) | 1]);
grid.lo = low; grid.lo = low;
grid.hi = top; grid.hi = top;
} }
@@ -1043,7 +1043,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
if (used.get(lemIdx)) continue; if (used.get(lemIdx)) continue;
val low = grid.lo; val low = grid.lo;
val top = grid.hi; val top = grid.hi;
if (!placeWord(grid, s, w)) continue; if (!placeWord(grid, k, s.lo, s.hi, w)) continue;
used.set(lemIdx); used.set(lemIdx);
assigned[k] = w; assigned[k] = w;
@@ -1054,7 +1054,6 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
used.clear(lemIdx); used.clear(lemIdx);
grid.lo = low; grid.lo = low;
grid.hi = top; grid.hi = top;
//grid.undoPlace(undo[depth << 1], undo[(depth << 1) | 1]);
} }
backtracks++; backtracks++;

26
src/test/java/puzzle/SwedishGeneratorTest.java
View File

@@ -82,7 +82,7 @@ public class SwedishGeneratorTest {
grid.setLetterLo(1, LETTER_B); grid.setLetterLo(1, LETTER_B);
grid.setLetterLo(2, LETTER_C); grid.setLetterLo(2, LETTER_C);
var slot = Slot.from(18 << Slot.BIT_FOR_DIR | (CLUE_RIGHT), 7L, 0L); var slot = Slot.from(18 << Slot.BIT_FOR_DIR | (CLUE_RIGHT), 7L, 0L);
var pattern = patternForSlot(grid, slot); var pattern = patternForSlot(grid, slot.key(), slot.lo(), slot.hi());
assertEquals(1L | (28L << 8) | (55L << 16), pattern); assertEquals(1L | (28L << 8) | (55L << 16), pattern);
} }
@@ -93,7 +93,7 @@ public class SwedishGeneratorTest {
grid.setLetterLo(OFF_0_0, LETTER_A); grid.setLetterLo(OFF_0_0, LETTER_A);
grid.setLetterLo(2, LETTER_C); grid.setLetterLo(2, LETTER_C);
var slot = Slot.from(1 << Slot.BIT_FOR_DIR | (CLUE_RIGHT), 7L, 0L); var slot = Slot.from(1 << Slot.BIT_FOR_DIR | (CLUE_RIGHT), 7L, 0L);
var pattern = patternForSlot(grid, slot); var pattern = patternForSlot(grid, slot.key(), slot.lo(), slot.hi());
assertEquals(1L | (0L << 8) | (55L << 16), pattern); assertEquals(1L | (0L << 8) | (55L << 16), pattern);
} }
@@ -102,7 +102,7 @@ public class SwedishGeneratorTest {
void testPatternForSlotAllDashes() { void testPatternForSlotAllDashes() {
var grid = createEmpty(); var grid = createEmpty();
var slot = Slot.from(1 << Slot.BIT_FOR_DIR | (CLUE_RIGHT), 7L, 0L); var slot = Slot.from(1 << Slot.BIT_FOR_DIR | (CLUE_RIGHT), 7L, 0L);
var pattern = patternForSlot(grid, slot); var pattern = patternForSlot(grid, slot.key(), slot.lo(), slot.hi());
assertEquals(0L, pattern); assertEquals(0L, pattern);
} }
@@ -112,7 +112,7 @@ public class SwedishGeneratorTest {
var grid = createEmpty(); var grid = createEmpty();
grid.setLetterLo(OFF_0_0, LETTER_A); grid.setLetterLo(OFF_0_0, LETTER_A);
var slot = Slot.from(1 << Slot.BIT_FOR_DIR | (CLUE_RIGHT), 7L, 0L); var slot = Slot.from(1 << Slot.BIT_FOR_DIR | (CLUE_RIGHT), 7L, 0L);
var pattern = patternForSlot(grid, slot); var pattern = patternForSlot(grid, slot.key(), slot.lo(), slot.hi());
assertEquals(1L, pattern); assertEquals(1L, pattern);
} }
@@ -336,17 +336,17 @@ public class SwedishGeneratorTest {
var w1 = ABC; var w1 = ABC;
// 1. Successful placement in empty grid // 1. Successful placement in empty grid
assertTrue(placeWord(grid, s, w1)); assertTrue(placeWord(grid, s.key(), s.lo(), s.hi(), w1));
assertEquals(LETTER_A, grid.letter32At(OFF_0_0)); assertEquals(LETTER_A, grid.letter32At(OFF_0_0));
assertEquals(LETTER_B, grid.letter32At(OFF_0_1)); assertEquals(LETTER_B, grid.letter32At(OFF_0_1));
assertEquals(LETTER_C, grid.letter32At(OFF_0_2)); assertEquals(LETTER_C, grid.letter32At(OFF_0_2));
// 2. Successful placement with partial overlap (same characters) // 2. Successful placement with partial overlap (same characters)
assertTrue(placeWord(grid, s, w1)); assertTrue(placeWord(grid, s.key(), s.lo(), s.hi(), w1));
// 3. Conflict: place "ABD" where "ABC" is // 3. Conflict: place "ABD" where "ABC" is
var w2 = ABD; var w2 = ABD;
assertFalse(placeWord(grid, s, w2)); assertFalse(placeWord(grid, s.key(), s.lo(), s.hi(), w2));
// Verify grid is unchanged (still "ABC") // Verify grid is unchanged (still "ABC")
assertEquals(LETTER_A, grid.letter32At(OFF_0_0)); assertEquals(LETTER_A, grid.letter32At(OFF_0_0));
assertEquals(LETTER_B, grid.letter32At(OFF_0_1)); assertEquals(LETTER_B, grid.letter32At(OFF_0_1));
@@ -355,7 +355,7 @@ public class SwedishGeneratorTest {
// 4. Partial placement then conflict (rollback) // 4. Partial placement then conflict (rollback)
grid = createEmpty(); grid = createEmpty();
grid.setLetterLo(OFF_0_2, LETTER_X); // Conflict at the end grid.setLetterLo(OFF_0_2, LETTER_X); // Conflict at the end
assertFalse(placeWord(grid, s, w1)); assertFalse(placeWord(grid, s.key(), s.lo(), s.hi(), w1));
// Verify grid is still empty (except for 'X') // Verify grid is still empty (except for 'X')
assertFalse(grid.lisLetterAtLo(OFF_0_0)); assertFalse(grid.lisLetterAtLo(OFF_0_0));
assertFalse(grid.lisLetterAtLo(OFF_0_1)); assertFalse(grid.lisLetterAtLo(OFF_0_1));
@@ -372,7 +372,7 @@ public class SwedishGeneratorTest {
var w = AZ; var w = AZ;
val low = grid.lo; val low = grid.lo;
val top = grid.hi; val top = grid.hi;
var placed = placeWord(grid, s, w); var placed = placeWord(grid, s.key(), s.lo(), s.hi(), w);
assertTrue(placed); assertTrue(placed);
assertEquals(LETTER_A, grid.letter32At(OFF_0_1)); assertEquals(LETTER_A, grid.letter32At(OFF_0_1));
assertEquals(LETTER_Z, grid.letter32At(OFF_0_2)); assertEquals(LETTER_Z, grid.letter32At(OFF_0_2));
@@ -392,10 +392,10 @@ public class SwedishGeneratorTest {
assertTrue(Slot.increasing(CLUE_DOWN)); // Down assertTrue(Slot.increasing(CLUE_DOWN)); // Down
assertFalse(Slot.increasing(CLUE_UP)); // Up assertFalse(Slot.increasing(CLUE_UP)); // Up
var sInc = Slot.from((0 << Slot.BIT_FOR_DIR) | CLUE_RIGHT, 1L, 0L); var sInc = Slot.from((0) | CLUE_RIGHT, 1L, 0L);
assertTrue(sInc.increasing()); assertTrue(Slot.increasing(sInc.key()));
var sDec = Slot.from((0 << Slot.BIT_FOR_DIR) | CLUE_LEFT, 1L, 0L); var sDec = Slot.from((0) | CLUE_LEFT, 1L, 0L);
assertFalse(sDec.increasing()); assertFalse(Slot.increasing(sDec.key()));
// 2. Test slotScore // 2. Test slotScore
val counts = new byte[SIZE]; val counts = new byte[SIZE];