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-10 05:53:23 +01:00
parent 2cfdf9209f
commit 558f0f9e0e
3 changed files with 37 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,13 +144,11 @@ public record SwedishGenerator(Rng rng) {
public Grid(byte[] g) { this(g, new long[2]); } public Grid(byte[] g) { this(g, new long[2]); }
static Grid createEmpty() { return new Grid(new byte[SIZE], new long[2]); } static Grid createEmpty() { return new Grid(new byte[SIZE], new long[2]); }
int digitAt(int r, int c) { return g[offset(r, c)] - 48; }
int digitAt(int index) { return g[index] - 48; } int digitAt(int index) { return g[index] - 48; }
public static int r(int offset) { return offset & 7; } public static int r(int offset) { return offset & 7; }
public static int c(int offset) { return offset >>> 3; } public static int c(int offset) { return offset >>> 3; }
static int offset(int r, int c) { return r | (c << 3); } static int offset(int r, int c) { return r | (c << 3); }
Grid deepCopyGrid() { return new Grid(g.clone(), bo.clone()); } Grid deepCopyGrid() { return new Grid(g.clone(), bo.clone()); }
public byte byteAt(int r, int c) { return g[offset(r, c)]; }
public byte byteAt(int pos) { return g[pos]; } public byte byteAt(int pos) { return g[pos]; }
void setByteAt(int idx, byte ch) { g[idx] = ch; } void setByteAt(int idx, byte ch) { g[idx] = ch; }
void setAt(int idx, byte ch) { void setAt(int idx, byte ch) {
@@ -169,7 +167,6 @@ public record SwedishGenerator(Rng rng) {
else bo[1] &= ~(1L << (idx & 63)); else bo[1] &= ~(1L << (idx & 63));
} }
static boolean isDigit(byte b) { return (b & 48) == 48; } static boolean isDigit(byte b) { return (b & 48) == 48; }
boolean isDigitAt(int r, int c) { return isDigit(g[offset(r, c)]); }
boolean isDigitAt(int index) { return isDigit(g[index]); } boolean isDigitAt(int index) { return isDigit(g[index]); }
boolean isClue(int index) { boolean isClue(int index) {
if (index < 64) { if (index < 64) {
@@ -197,10 +194,8 @@ public record SwedishGenerator(Rng rng) {
} }
} }
static boolean isLetter(byte b) { return (b & 64) != 0; } static boolean isLetter(byte b) { return (b & 64) != 0; }
public boolean isLetterSet(int r, int c) { return isLetter(g[offset(r, c)]); }
public boolean isLetterSet(int idx) { return isLetter(g[idx]); } public boolean isLetterSet(int idx) { return isLetter(g[idx]); }
static boolean notDigit(byte b) { return (b & 48) != 48; } static boolean notDigit(byte b) { return (b & 48) != 48; }
public boolean isLetterAt(int r, int c) { return notDigit(g[offset(r, c)]); }
public boolean isLetterAt(int index) { return notDigit(g[index]); } public boolean isLetterAt(int index) { return notDigit(g[index]); }
public double similarity(Grid b) { public double similarity(Grid b) {
@@ -328,10 +323,10 @@ public record SwedishGenerator(Rng rng) {
} }
static int intersectSorted(int[] a, int aLen, int[] b, int bLen, int[] out) { static int intersectSorted(int[] a, int aLen, int[] b, int bLen, int[] out) {
int i = 0, j = 0, k = 0; int i = 0, j = 0, k = 0, x, y;
while (i < aLen && j < bLen) { while (i < aLen && j < bLen) {
int x = a[i]; x = a[i];
int y = b[j]; y = b[j];
if (x == y) { if (x == y) {
out[k++] = x; out[k++] = x;
i++; i++;
@@ -455,7 +450,7 @@ public record SwedishGenerator(Rng rng) {
long packed = Neighbors9x8.NBR8_PACKED[Grid.offset(rr, cc)]; long packed = Neighbors9x8.NBR8_PACKED[Grid.offset(rr, cc)];
int n = (int) (packed >>> 56); int n = (int) (packed >>> 56);
for (int k = 0; k < n; k++) { for (int k = 0; k < n; k++) {
int nidx = (int)((packed >>> (k * 7)) & 0x7F); int nidx = (int) ((packed >>> (k * 7)) & 0x7F);
if (seen.get(nidx) || grid.isLetterAt(nidx)) continue; if (seen.get(nidx) || grid.isLetterAt(nidx)) continue;
seen.set(nidx); seen.set(nidx);

14
src/test/java/puzzle/MainTest.java
View File

@@ -87,10 +87,10 @@ public class MainTest {
Assertions.assertEquals(DASH, grid.byteAt(Grid.offset(1, 1))); Assertions.assertEquals(DASH, grid.byteAt(Grid.offset(1, 1)));
// Test isLetterAt // Test isLetterAt
Assertions.assertTrue(grid.isLetterSet(0, 0)); Assertions.assertTrue(grid.isLetterSet(Grid.offset(0, 0)));
Assertions.assertFalse(grid.isLetterSet(1, 2)); Assertions.assertFalse(grid.isLetterSet(Grid.offset(1, 2)));
Assertions.assertTrue(grid.isLetterSet(2, 3)); Assertions.assertTrue(grid.isLetterSet(Grid.offset(2, 3)));
Assertions.assertFalse(grid.isLetterSet(1, 1)); Assertions.assertFalse(grid.isLetterSet(Grid.offset(1, 1)));
// Test isDigitAt // Test isDigitAt
Assertions.assertFalse(grid.isDigitAt(0)); Assertions.assertFalse(grid.isDigitAt(0));
@@ -100,9 +100,9 @@ public class MainTest {
Assertions.assertFalse(grid.isDigitAt(Grid.offset(1, 1))); Assertions.assertFalse(grid.isDigitAt(Grid.offset(1, 1)));
// Test isLettercell // Test isLettercell
Assertions.assertTrue(grid.isLetterAt(0, 0)); // 'A' is letter Assertions.assertTrue(grid.isLetterAt(Grid.offset(0, 0))); // 'A' is letter
Assertions.assertFalse(grid.isLetterAt(1, 2)); // '5' is digit Assertions.assertFalse(grid.isLetterAt(Grid.offset(1, 2))); // '5' is digit
Assertions.assertTrue(grid.isLetterAt(1, 1)); // '#' is lettercell Assertions.assertTrue(grid.isLetterAt(Grid.offset(1, 1))); // '#' is lettercell
} }
@Test @Test

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

@@ -73,20 +73,20 @@ public class SwedishGeneratorTest {
grid.setByteAt(0, (byte) 'A'); grid.setByteAt(0, (byte) 'A');
grid.setClue(Grid.offset(0, 1), (byte) '1'); grid.setClue(Grid.offset(0, 1), (byte) '1');
assertEquals('A', grid.byteAt(0, 0)); assertEquals('A', grid.byteAt(0));
assertEquals(1, grid.digitAt(0, 1)); assertEquals(1, grid.digitAt(Grid.offset(0, 1)));
assertTrue(grid.isLetterAt(0)); assertTrue(grid.isLetterAt(0));
assertFalse(grid.isDigitAt(0)); assertFalse(grid.isDigitAt(0));
assertTrue(grid.isDigitAt(Grid.offset(0, 1))); assertTrue(grid.isDigitAt(Grid.offset(0, 1)));
assertFalse(grid.isLetterAt(Grid.offset(0, 1))); assertFalse(grid.isLetterAt(Grid.offset(0, 1)));
assertTrue(grid.isLetterAt(0, 0)); assertTrue(grid.isLetterAt( 0));
assertFalse(grid.isLetterAt(0, 1)); assertFalse(grid.isLetterAt(Grid.offset(0, 1)));
var copy = grid.deepCopyGrid(); var copy = grid.deepCopyGrid();
assertEquals('A', copy.byteAt(0, 0)); assertEquals('A', copy.byteAt(0));
copy.setByteAt(0, (byte) 'B'); copy.setByteAt(0, (byte) 'B');
assertEquals('B', copy.byteAt(0, 0)); assertEquals('B', copy.byteAt(0));
assertEquals('A', grid.byteAt(0, 0)); assertEquals('A', grid.byteAt(0));
} }
@Test @Test
@@ -279,9 +279,9 @@ public class SwedishGeneratorTest {
// 1. Successful placement in empty grid // 1. Successful placement in empty grid
assertTrue(placeWord(grid, s, w1, undoBuffer, 0)); assertTrue(placeWord(grid, s, w1, undoBuffer, 0));
assertEquals('A', grid.byteAt(0, 0)); assertEquals('A', grid.byteAt( 0));
assertEquals('B', grid.byteAt(0, 1)); assertEquals('B', grid.byteAt(Grid.offset(0, 1)));
assertEquals('C', grid.byteAt(0, 2)); assertEquals('C', grid.byteAt(Grid.offset(0, 2)));
assertEquals(0b111L, undoBuffer[0]); assertEquals(0b111L, undoBuffer[0]);
// 2. Successful placement with partial overlap (same characters) // 2. Successful placement with partial overlap (same characters)
@@ -292,18 +292,18 @@ public class SwedishGeneratorTest {
var w2 = new Lemma("ABD", 1, "conflict"); var w2 = new Lemma("ABD", 1, "conflict");
assertFalse(placeWord(grid, s, w2, undoBuffer, 2)); assertFalse(placeWord(grid, s, w2, undoBuffer, 2));
// Verify grid is unchanged (still "ABC") // Verify grid is unchanged (still "ABC")
assertEquals('A', grid.byteAt(0, 0)); assertEquals('A', grid.byteAt(Grid.offset(0, 0)));
assertEquals('B', grid.byteAt(0, 1)); assertEquals('B', grid.byteAt(Grid.offset(0, 1)));
assertEquals('C', grid.byteAt(0, 2)); assertEquals('C', grid.byteAt(Grid.offset(0, 2)));
// 4. Partial placement then conflict (rollback) // 4. Partial placement then conflict (rollback)
grid = Grid.createEmpty(); grid = Grid.createEmpty();
grid.setByteAt(Grid.offset(0, 2), (byte) 'X'); // Conflict at the end grid.setByteAt(Grid.offset(0, 2), (byte) 'X'); // Conflict at the end
assertFalse(placeWord(grid, s, w1, undoBuffer, 3)); assertFalse(placeWord(grid, s, w1, undoBuffer, 3));
// Verify grid is still empty (except for 'X') // Verify grid is still empty (except for 'X')
assertEquals(DASH, grid.byteAt(0, 0)); assertEquals(DASH, grid.byteAt(Grid.offset(0, 0)));
assertEquals(DASH, grid.byteAt(0, 1)); assertEquals(DASH, grid.byteAt(Grid.offset(0, 1)));
assertEquals('X', grid.byteAt(0, 2)); assertEquals('X', grid.byteAt(Grid.offset(0, 2)));
} }
@Test @Test
@@ -317,12 +317,12 @@ public class SwedishGeneratorTest {
var placed = placeWord(grid, s, w, undoBuffer, 0); var placed = placeWord(grid, s, w, undoBuffer, 0);
assertTrue(placed); assertTrue(placed);
assertEquals('A', grid.byteAt(0, 1)); assertEquals('A', grid.byteAt(Grid.offset(0, 1)));
assertEquals('Z', grid.byteAt(0, 2)); assertEquals('Z', grid.byteAt(Grid.offset(0, 2)));
assertEquals(0b11L, undoBuffer[0]); assertEquals(0b11L, undoBuffer[0]);
s.undoPlace(grid, undoBuffer[0]); s.undoPlace(grid, undoBuffer[0]);
assertEquals(DASH, grid.byteAt(0, 1)); assertEquals(DASH, grid.byteAt(Grid.offset(0, 1)));
assertEquals(DASH, grid.byteAt(0, 2)); assertEquals(DASH, grid.byteAt(Grid.offset(0, 2)));
} }
} }