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

23
src/test/java/puzzle/ExportFormatTest.java
View File

@@ -1,5 +1,6 @@
package puzzle;
import lombok.AllArgsConstructor;
import lombok.val;
import org.junit.jupiter.api.Test;
import puzzle.Export.Clued;
@@ -9,11 +10,13 @@ import puzzle.Export.PuzzleResult;
import puzzle.Export.Rewards;
import puzzle.SwedishGenerator.FillResult;
import puzzle.SwedishGenerator.Rng;
import puzzle.SwedishGeneratorTest.Idx;
import java.io.IOException;
import java.nio.file.Paths;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static puzzle.ExportFormatTest.Clue.RIGHT;
import static puzzle.SwedishGenerator.C;
import static puzzle.SwedishGenerator.Clues;
import static puzzle.SwedishGenerator.FillStats;
@@ -35,19 +38,33 @@ public class ExportFormatTest {
static final byte CLUE_UP = 2;
static final byte CLUE_LEFT = 3;
@AllArgsConstructor
enum Clue {
DOWN(CLUE_DOWN),
RIGHT(CLUE_RIGHT),
UP(CLUE_UP),
LEFT(CLUE_LEFT);
Clue(byte dir) {
this.dir = dir;
this.clueDir = dir;
}
final byte dir;
final int clueDir;
}
@Test
void testExportFormatFromFilled() {
var swe = new SwedishGenerator(new Rng(0), new int[STACK_SIZE], Clues.createEmpty());
val clues = Clues.createEmpty();
// Place a RIGHT clue at (0,0)
clues.setClue(0, CLUE_RIGHT);
clues.setClueLo(Idx.IDX_0_0.lo, RIGHT.dir);
// This creates a slot starting at (0,1)
// Terminate the slot at (0,5) with another digit to avoid it extending to MAX_WORD_LENGTH
clues.setClue(OFF_0_5, CLUE_LEFT);
clues.setClueLo(Idx.IDX_0_5.lo, CLUE_LEFT);
var grid = new Gridded(clues.toGrid());
var clueMap = new long[300];
var clueMap = new long[SwedishGenerator.CLUE_INDEX_MAX_SIZE];
// key = (cellIndex << 2) | (direction)
var key = Slot.packSlotKey(0, CLUE_RIGHT);
var lo = (1L << OFF_0_1) | (1L << OFF_0_2) | (1L << OFF_0_3) | (1L << OFF_0_4);

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

@@ -18,6 +18,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static puzzle.SwedishGenerator.*;
import static puzzle.SwedishGeneratorTest.*;
import static puzzle.SwedishGeneratorTest.Idx.IDX_0_0;
import static puzzle.SwedishGeneratorTest.Idx.IDX_0_1;
import static puzzle.SwedishGeneratorTest.Idx.IDX_1_0;
import static puzzle.SwedishGeneratorTest.Idx.IDX_1_1;
import static puzzle.SwedishGeneratorTest.Idx.IDX_2_1;
import static puzzle.SwedishGeneratorTest.OFF_0_0;
import static puzzle.SwedishGeneratorTest.OFF_0_1;
import static puzzle.SwedishGeneratorTest.OFF_0_2;
@@ -41,7 +46,7 @@ public class MainTest {
var clues = Clues.createEmpty();
val key = Slot.packSlotKey(OFF_0_0, CLUE_RIGHT);
clues.setClue(OFF_0_0, CLUE_RIGHT);
clues.setClueLo(IDX_0_0.lo, CLUE_RIGHT);
var grid = new Gridded(clues.toGrid());
val g = grid.grid().g;
placeWord(grid.grid(), g, key, (1L << OFF_0_1) | (1L << OFF_0_2), 0, AB);
@@ -69,7 +74,7 @@ public class MainTest {
@Test
void testForEachSlot() {
var clues = Clues.createEmpty();
clues.setClue(OFF_0_0, CLUE_RIGHT);
clues.setClueLo(IDX_0_0.lo, CLUE_RIGHT);
var count = new AtomicInteger(0);
clues.forEachSlot((key, lo, hi) -> {
count.incrementAndGet();
@@ -90,7 +95,7 @@ public class MainTest {
public void testGridBasics() {
var clues = Clues.createEmpty();
val key = Slot.packSlotKey(OFF_2_1, CLUE_UP);
clues.setClue(OFF_2_1, CLUE_UP);
clues.setClueLo(IDX_2_1.lo, CLUE_UP);
var grid = new Gridded(clues.toGrid());
// Test set/get
@@ -98,47 +103,47 @@ public class MainTest {
val arr = grid.stream(clues).collect(Collectors.toMap(LetterAt::index, LetterAt::letter));
Assertions.assertEquals(LETTER_A, arr.get(OFF_1_1));
Assertions.assertEquals(LETTER_Z, arr.get(OFF_0_1));
Assertions.assertEquals(CLUE_UP, clues.digitAt(OFF_2_1));
Assertions.assertEquals(CLUE_UP, (byte) clues.digitAtLo(OFF_2_1));
// Test isLetterAt
Assertions.assertTrue(clues.notClue(OFF_0_0));
Assertions.assertTrue(clues.notClue(OFF_1_2));
Assertions.assertTrue(clues.notClue(OFF_2_3));
Assertions.assertFalse(clues.isClue(OFF_1_1));
Assertions.assertFalse(clues.isClueLo(OFF_1_1));
// Test isDigitAt
Assertions.assertFalse(clues.isClue(0));
Assertions.assertTrue(clues.isClue(OFF_2_1));
Assertions.assertEquals(CLUE_UP, clues.digitAt(OFF_2_1));
Assertions.assertFalse(clues.isClue(OFF_2_3));
Assertions.assertFalse(clues.isClue(OFF_1_1));
Assertions.assertFalse(clues.isClueLo(OFF_0_0));
Assertions.assertTrue(clues.isClueLo(OFF_2_1));
Assertions.assertEquals(CLUE_UP, (byte) clues.digitAtLo(OFF_2_1));
Assertions.assertFalse(clues.isClueLo(OFF_2_3));
Assertions.assertFalse(clues.isClueLo(OFF_1_1));
// Test isLettercell
Assertions.assertTrue(clues.notClue(OFF_0_0)); // 'A' is letter
Assertions.assertTrue(clues.isClue(OFF_2_1)); // digit
Assertions.assertTrue(clues.isClueLo(OFF_2_1)); // digit
Assertions.assertTrue(clues.notClue(OFF_1_1)); // '#' is lettercell
}
@Test
public void testCluesDeepCopy() {
var grid = Clues.createEmpty();
grid.setClue(OFF_0_0, (byte) 1);
grid.setClue(OFF_0_1, (byte) 2);
grid.setClue(OFF_1_0, (byte) 3);
grid.setClue(OFF_1_1, (byte) 0);
grid.setClueLo(IDX_0_0.lo, (byte) 1);
grid.setClueLo(IDX_0_1.lo, (byte) 2);
grid.setClueLo(IDX_1_0.lo, (byte) 3);
grid.setClueLo(IDX_1_1.lo, (byte) 0);
var copy = grid.deepCopyGrid();
Assertions.assertEquals((byte) 1, copy.digitAt(0));
Assertions.assertEquals(1, copy.digitAtLo(0));
copy.setClue(0, (byte) 3);
Assertions.assertEquals((byte) 3, copy.digitAt(0));
Assertions.assertEquals((byte) 1, grid.digitAt(0)); // Original should be unchanged
copy.setClueLo(IDX_0_0.lo, (byte) 3);
Assertions.assertEquals(3, copy.digitAtLo(0));
Assertions.assertEquals(1, grid.digitAtLo(0)); // Original should be unchanged
}
@Test
public void testMini() {
val idx = OFF_1_1;
val idx = IDX_1_1;
var clues = Clues.createEmpty();
clues.setClue(idx, CLUE_LEFT);
Assertions.assertTrue(clues.isClue(idx));
clues.setClueLo(idx.lo, CLUE_LEFT);
Assertions.assertTrue(clues.isClueLo(idx.index));
}
@Test
void testMaskerCreation() {

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);
}