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-12 22:22:19 +01:00
parent 88a61e6f4d
commit a9b4dfb422
4 changed files with 148 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,15 +16,30 @@ import static puzzle.SwedishGenerator.DASH;
public class MainTest {
static final byte LETTER_A = (byte) 'A';
static final byte LETTER_B = (byte) 'B';
static final byte LETTER_Z = (byte) 'Z';
static final byte CLUE_UP = 0;
static final byte CLUE_RIGHT = 1;
static final byte CLUE_DOWN = 2;
static final byte CLUE_LEFT = 3;
static final int OFF_0_0 = Grid.offset(0, 0);
static final int OFF_0_1 = Grid.offset(0, 1);
static final int OFF_0_2 = Grid.offset(0, 2);
static final int OFF_1_1 = Grid.offset(1, 1);
static final int OFF_1_2 = Grid.offset(1, 2);
static final int OFF_2_3 = Grid.offset(2, 3);
@Test
void testExtractSlots() {
var grid = Grid.createEmpty();
// Set up digits on the grid to create slots.
// '2' (right) at (0,0) -> slot at (0,1), (0,2)
grid.setClue(0, (byte) '2');
grid.setLetter(Grid.offset(0, 1), (byte) 'A');
grid.setLetter(Grid.offset(0, 2), (byte) 'B');
// CLUE_RIGHT at OFF_0_0 -> slot at (0,1), (0,2)
grid.setClue(OFF_0_0, CLUE_RIGHT);
grid.setLetter(OFF_0_1, LETTER_A);
grid.setLetter(OFF_0_2, LETTER_B);
var slots = extractSlots(grid);
assertEquals(1, slots.size());
@@ -49,7 +64,7 @@ public class MainTest {
@Test
void testForEachSlot() {
var grid = Grid.createEmpty();
grid.setClue(0, (byte) '2'); // right
grid.setClue(OFF_0_0, CLUE_RIGHT); // right
var count = new AtomicInteger(0);
grid.forEachSlot((key, lo, hi) -> {
@@ -72,32 +87,32 @@ public class MainTest {
var grid = Grid.createEmpty();
// Test set/get
grid.setLetter(Grid.offset(0, 0), (byte) 'A');
grid.setClue(Grid.offset(1, 2), (byte) '3');
grid.setLetter(Grid.offset(2, 3), (byte) 'Z');
grid.setLetter(OFF_0_0, LETTER_A);
grid.setClue(OFF_1_2, CLUE_UP);
grid.setLetter(OFF_2_3, LETTER_Z);
Assertions.assertEquals((byte) 'A', grid.byteAt(Grid.offset(0, 0)));
Assertions.assertEquals((byte) '3', grid.byteAt(Grid.offset(1, 2)));
Assertions.assertEquals((byte) 'Z', grid.byteAt(Grid.offset(2, 3)));
Assertions.assertEquals(DASH, grid.byteAt(Grid.offset(1, 1)));
Assertions.assertEquals(LETTER_A, grid.byteAt(OFF_0_0));
Assertions.assertEquals(CLUE_UP, grid.byteAt(OFF_1_2));
Assertions.assertEquals(LETTER_Z, grid.byteAt(OFF_2_3));
Assertions.assertEquals(DASH, grid.byteAt(OFF_1_1));
// Test isLetterAt
Assertions.assertTrue(grid.notClue(Grid.offset(0, 0)));
Assertions.assertFalse(grid.notClue(Grid.offset(1, 2)));
Assertions.assertTrue(grid.notClue(Grid.offset(2, 3)));
Assertions.assertFalse(grid.isClue(Grid.offset(1, 1)));
Assertions.assertTrue(grid.notClue(OFF_0_0));
Assertions.assertFalse(grid.notClue(OFF_1_2));
Assertions.assertTrue(grid.notClue(OFF_2_3));
Assertions.assertFalse(grid.isClue(OFF_1_1));
// Test isDigitAt
Assertions.assertFalse(grid.isClue(0));
Assertions.assertTrue(grid.isClue(Grid.offset(1, 2)));
Assertions.assertEquals(3, grid.digitAt(Grid.offset(1, 2)));
Assertions.assertFalse(grid.isClue(Grid.offset(2, 3)));
Assertions.assertFalse(grid.isClue(Grid.offset(1, 1)));
Assertions.assertTrue(grid.isClue(OFF_1_2));
Assertions.assertEquals(CLUE_UP, grid.digitAt(OFF_1_2));
Assertions.assertFalse(grid.isClue(OFF_2_3));
Assertions.assertFalse(grid.isClue(OFF_1_1));
// Test isLettercell
Assertions.assertTrue(grid.notClue(Grid.offset(0, 0))); // 'A' is letter
Assertions.assertTrue(grid.isClue(Grid.offset(1, 2))); // '5' is digit
Assertions.assertTrue(grid.notClue(Grid.offset(1, 1))); // '#' is lettercell
Assertions.assertTrue(grid.notClue(OFF_0_0)); // 'A' is letter
Assertions.assertTrue(grid.isClue(OFF_1_2)); // digit
Assertions.assertTrue(grid.notClue(OFF_1_1)); // '#' is lettercell
}
@Test
@@ -119,8 +134,8 @@ public class MainTest {
@Test
public void testMini() {
var grid = Grid.createEmpty();
val idx = Grid.offset(1, 1);
grid.setClue(idx, (byte) '1');
val idx = OFF_1_1;
grid.setClue(idx, CLUE_LEFT);
Assertions.assertTrue(grid.isClue(idx));
}
@Test
@@ -163,9 +178,9 @@ public class MainTest {
// Regression baseline for seed search starting at 12347, pop 4, gens 20
Assertions.assertEquals(12348, foundSeed, "Found seed changed");
Assertions.assertEquals(18, res.filled().clueMap().size(), "Number of assigned words changed");
Assertions.assertEquals("TEN", Lemma.asWord(res.filled().clueMap().get(2)));
Assertions.assertEquals(301794542151533187L, res.filled().grid().grid().lo);
Assertions.assertEquals(193L, res.filled().grid().grid().hi);
Assertions.assertEquals("DISCO", Lemma.asWord(res.filled().clueMap().get(476)));
Assertions.assertEquals(3332734179516361088L, res.filled().grid().grid().lo);
Assertions.assertEquals(128L, res.filled().grid().grid().hi);
}
boolean isLetter(byte b) { return (b & 64) != 0; }
@Test