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-16 22:46:04 +01:00
parent ecbc408cce
commit 91722ecc60
4 changed files with 202 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,11 +7,11 @@ import puzzle.Export.Gridded;
import puzzle.Export.IntListDTO;
import puzzle.Export.LetterVisit.LetterAt;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.*;
import static puzzle.SwedishGenerator.*;
import static puzzle.SwedishGeneratorTest.Idx.IDX_0_0;
public class SwedishGeneratorTest {
@@ -67,29 +67,79 @@ public class SwedishGeneratorTest {
static final byte CLUE_UP = 2;
static final byte CLUE_LEFT = 3;
static final int OFF_1_0 = Grid.offset(1, 0);
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_1 = Grid.offset(2, 1);
static final int OFF_2_3 = Grid.offset(2, 3);
static final int OFF_0_0 = Grid.offset(0, 0);
static final int OFF_0_4 = Grid.offset(0, 4);
static final int OFF_0_5 = Grid.offset(0, 5);
static final int OFF_0_1 = Grid.offset(0, 1);
static final int OFF_0_2 = Grid.offset(0, 2);
static final int OFF_0_3 = Grid.offset(0, 3);
static final int OFF_2_0 = Grid.offset(2, 0);
static final int OFF_2_5 = Grid.offset(2, 5);
static final int OFF_3_5 = Grid.offset(3, 5);
static final int OFF_4_5 = Grid.offset(4, 5);
static final int OFF_1_0 = Grid.offset(1, 0);
static final int OFF_1_1 = Grid.offset(1, 1);
static final int OFF_1_2 = Grid.offset(1, 2);
static final int OFF_1_3 = Grid.offset(1, 3);
static final int OFF_1_4 = Grid.offset(1, 4);
static final int OFF_1_5 = Grid.offset(1, 5);
static final int OFF_2_1 = Grid.offset(2, 1);
static final int OFF_2_3 = Grid.offset(2, 3);
static final int OFF_2_2 = Grid.offset(2, 2);
static final int OFF_2_4 = Grid.offset(2, 4);
static final int OFF_0_0 = Grid.offset(0, 0);
static final int OFF_0_4 = Grid.offset(0, 4);
static final int OFF_0_5 = Grid.offset(0, 5);
static final int OFF_0_1 = Grid.offset(0, 1);
static final int OFF_0_2 = Grid.offset(0, 2);
static final int OFF_0_3 = Grid.offset(0, 3);
static final int OFF_2_0 = Grid.offset(2, 0);
static final int OFF_2_5 = Grid.offset(2, 5);
static final int OFF_3_5 = Grid.offset(3, 5);
static final int OFF_4_5 = Grid.offset(4, 5);
static final int OFF_3_0 = Grid.offset(3, 0);
static final int OFF_3_1 = Grid.offset(3, 1);
static final int OFF_3_2 = Grid.offset(3, 2);
static final int OFF_3_3 = Grid.offset(3, 3);
static final int OFF_3_4 = Grid.offset(3, 4);
static final byte D_BYTE_2 = CLUE_RIGHT;
enum Idx {
IDX_0_0(OFF_0_0, 0, 0),
IDX_0_1(OFF_0_1, 0, 1),
IDX_0_2(OFF_0_2, 0, 2),
IDX_0_3(OFF_0_3, 0, 3),
IDX_0_4(OFF_0_4, 0, 4),
IDX_0_5(OFF_0_5, 0, 5),
IDX_1_0(OFF_1_0, 1, 0),
IDX_1_1(OFF_1_1, 1, 1),
IDX_1_2(OFF_1_2, 1, 2),
IDX_1_3(OFF_1_3, 1, 3),
IDX_1_4(OFF_1_4, 1, 4),
IDX_1_5(OFF_1_5, 1, 5),
IDX_2_0(OFF_2_0, 2, 0),
IDX_2_1(OFF_2_1, 2, 1),
IDX_2_2(OFF_2_2, 2, 2),
IDX_2_3(OFF_2_3, 2, 3),
IDX_2_4(OFF_2_4, 2, 4),
IDX_2_5(OFF_2_5, 2, 5),
IDX_3_0(OFF_3_0, 3, 0),
IDX_3_1(OFF_3_1, 3, 1),
IDX_3_2(OFF_3_2, 3, 2),
IDX_3_3(OFF_3_3, 3, 3),
IDX_3_4(OFF_3_4, 3, 4),
IDX_3_5(OFF_3_5, 3, 5);
Idx(int idx, int r, int c) {
this.index = idx;
this.r = r;
this.c = c;
if (isLo(idx)) {
this.lo = 1L << idx;
this.hi = 0L;
} else {
this.lo = 0L;
this.hi = 1L << (idx & 63);
}
}
final int index, r, c;
final long lo, hi;
}
@Test
void testPatternForSlotAllLetters() {
var grid = new Gridded(createEmpty());
var key = Slot.packSlotKey(OFF_0_0, CLUE_RIGHT);
val clues = Clues.createEmpty();
clues.setClue(OFF_0_0, CLUE_RIGHT);
clues.setClueLo(IDX_0_0.lo, CLUE_RIGHT);
placeWord(grid.grid(), grid.grid().g, key, (1L << OFF_0_1) | (1L << OFF_0_2) | (1L << OFF_0_3), 0L, ABC);
val map = grid.stream(clues).collect(Collectors.toMap(LetterAt::index, LetterAt::letter));
assertEquals(LETTER_A, map.get(OFF_0_1));
@@ -237,7 +287,7 @@ public class SwedishGeneratorTest {
void testForEachSlotAndExtractSlots() {
// This should detect a slot starting at 0,1 with length 2 (0,1 and 0,2)
var clues = Clues.createEmpty();
clues.setClue(OFF_0_0, CLUE_RIGHT);
clues.setClueLo(IDX_0_0.lo, CLUE_RIGHT);
var dict = new Dict(WORDS2);
var slots = extractSlots(clues, dict.index());
assertEquals(1, slots.length);
@@ -257,7 +307,7 @@ public class SwedishGeneratorTest {
assertTrue(f1 >= 1_000_000_000L);
// Add a slot
grid.setClue(OFF_0_0, D_BYTE_2);
grid.setClueLo(IDX_0_0.lo, D_BYTE_2);
var f2 = gen.maskFitness(grid, 18);
assertTrue(f2 < f1);
}
@@ -381,7 +431,7 @@ public class SwedishGeneratorTest {
// Empty grid: huge penalty
var fitEmpty = gen.maskFitness(grid, 18);
assertTrue(fitEmpty >= 1_000_000_000L);
grid.setClue(0, D_BYTE_2); // Right from 0,0. Len 2 if 3x3.
grid.setClueLo(IDX_0_0.lo, D_BYTE_2); // Right from 0,0. Len 2 if 3x3.
var fitOne = gen.maskFitness(grid, 18);
assertTrue(fitOne < fitEmpty);
}