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 02:17:51 +01:00
parent dd28151d49
commit 678add4cb9
3 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,10 +166,10 @@ public class MainTest {
// Regression baseline for seed search starting at 12347, pop 4, gens 20
Assertions.assertEquals(12348, foundSeed, "Found seed changed");
Assertions.assertEquals(22, res.filled().clueMap().size(), "Number of assigned words changed");
Assertions.assertEquals(Lemma.pack(new byte[]{ 'I', 'E', 'M', 'A', 'N', 'D', 'S' }), res.filled().clueMap().get(259).word());
Assertions.assertEquals(648985643903632391L, res.filled().grid().grid().lo);
Assertions.assertEquals(140L, res.filled().grid().grid().hi);
Assertions.assertEquals(18, res.filled().clueMap().size(), "Number of assigned words changed");
Assertions.assertEquals(Lemma.pack(new byte[]{ 'L', 'E', 'L', 'I', 'J', 'K', 'S' }), res.filled().clueMap().get(451).word());
Assertions.assertEquals(73207692597665799L, res.filled().grid().grid().lo);
Assertions.assertEquals(193L, res.filled().grid().grid().hi);
}
@Test
public void testIsLetterA() {

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

@@ -15,40 +15,36 @@ public class SwedishGeneratorTest {
void testPatternForSlotAllLetters() {
var grid = new Grid(new byte[]{ 65, 66, 67 }); // A B C
var slot = Slot.from(18, ((long) 0) | ((long) 1 << 7) | ((long) 2 << 14), 3);
var pattern = new byte[3];
patternForSlot(grid, slot, pattern);
long pattern = patternForSlot(grid, slot);
assertArrayEquals(new byte[]{ 'A', 'B', 'C' }, pattern);
assertEquals(1 | (2 << 5) | (3 << 10), pattern);
}
@Test
void testPatternForSlotMixed() {
var grid = new Grid(new byte[]{ 65, DASH, 67 }); // A - C
var slot = Slot.from(1 << 4 | 2, ((long) 0) | ((long) 1 << 7) | ((long) 2 << 14), 3);
var pattern = new byte[3];
patternForSlot(grid, slot, pattern);
long pattern = patternForSlot(grid, slot);
assertArrayEquals(new byte[]{ 'A', DASH, 'C' }, pattern);
assertEquals(1 | (0 << 5) | (3 << 10), pattern);
}
@Test
void testPatternForSlotAllDashes() {
var grid = new Grid(new byte[]{ DASH, DASH, DASH }); // - - -
var slot = Slot.from(1 << 4 | 2, ((long) 0) | ((long) 1 << 7) | ((long) 2 << 14), 3);
var pattern = new byte[3];
patternForSlot(grid, slot, pattern);
long pattern = patternForSlot(grid, slot);
assertArrayEquals(new byte[]{ DASH, DASH, DASH }, pattern);
assertEquals(0, pattern);
}
@Test
void testPatternForSlotSingleLetter() {
var grid = new Grid(new byte[]{ 65, DASH, DASH }); // A - -
var slot = Slot.from(1 << 4 | 2, ((long) 0) | ((long) 1 << 7) | ((long) 2 << 14), 3);
var pattern = new byte[3];
patternForSlot(grid, slot, pattern);
long pattern = patternForSlot(grid, slot);
assertArrayEquals(new byte[]{ 'A', DASH, DASH }, pattern);
assertEquals(1, pattern);
}
@Test
void testRng() {
@@ -198,7 +194,7 @@ public class SwedishGeneratorTest {
// Pattern "APP--" for length 5
var context = new Context();
context.setPatter(new byte[]{ 'A', 'P', 'P', DASH, DASH });
context.setPattern(Lemma.pack(new byte[]{ 'A', 'P', 'P', DASH, DASH }));
var info = candidateInfoForPattern(context, dict.index()[5], 5);
assertEquals(2, info.count());
@@ -214,7 +210,7 @@ public class SwedishGeneratorTest {
grid.setClue(0, (byte) '2');
// This should detect a slot starting at 0,1 with length 2 (0,1 and 0,2)
var slots = gen.extractSlots(grid);
var slots = extractSlots(grid);
// Depending on MAX_WORD_LENGTH and grid size.
// In 3x3, if we have '2' at 0,0, rr=0, cc=1.
// while loop: