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 10:38:24 +01:00
parent 67eedb773b
commit 6ef007522c
4 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,6 @@ public record SwedishGenerator(Rng rng) {
static final byte B64 = (byte) 64; static final byte B64 = (byte) 64;
static final byte B48 = (byte) 48; static final byte B48 = (byte) 48;
static final long[] OFFSETS_D_IDX = Neighbors9x8.OFFSET_D_IDX; static final long[] OFFSETS_D_IDX = Neighbors9x8.OFFSET_D_IDX;
static final nbrs_16[] OFFSETS_FOUR = Neighbors9x8.OFFSETS_FOUR;
static final rci[] IT = Neighbors9x8.IT; static final rci[] IT = Neighbors9x8.IT;
static final int[][] MUTATE_RI = new int[SIZE][625]; static final int[][] MUTATE_RI = new int[SIZE][625];
static final long[] NBR8_PACKED_LO = Neighbors9x8.NBR8_PACKED_LO; static final long[] NBR8_PACKED_LO = Neighbors9x8.NBR8_PACKED_LO;
@@ -206,10 +205,8 @@ public record SwedishGenerator(Rng rng) {
return true; return true;
} }
static boolean isLetter(byte b) { return (b & B64) != B0; } static boolean isLetter(byte b) { return (b & B64) != B0; }
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 & B48) != B48; }
public boolean isLetterAt(int index) { return notDigit(g[index]); }
public double similarity(Grid b) { public double similarity(Grid b) {
var same = 0; var same = 0;
@@ -363,7 +360,6 @@ public record SwedishGenerator(Rng rng) {
int clueIdx = i | Long.numberOfTrailingZeros(bits); int clueIdx = i | Long.numberOfTrailingZeros(bits);
var d = grid.digitAt(clueIdx); var d = grid.digitAt(clueIdx);
long packed = OFFSETS_D_IDX[(d - 1) | (clueIdx << 2)]; long packed = OFFSETS_D_IDX[(d - 1) | (clueIdx << 2)];
//if (OFFSETS_D_IDX[(d-1) * SIZE + clueIdx] != packed) throw new IllegalStateException("Invalid path index for digit " + d + " at clue " + clueIdx);
int n = (int) (packed >>> 56) * 7, k, idx; int n = (int) (packed >>> 56) * 7, k, idx;
var horiz = Slot.horiz(d) ? covH : covV; var horiz = Slot.horiz(d) ? covH : covV;
@@ -466,10 +462,10 @@ public record SwedishGenerator(Rng rng) {
for (int placed = 0, guard = 0, idx; placed < TARGET_CLUES && guard < 4000; guard++) { for (int placed = 0, guard = 0, idx; placed < TARGET_CLUES && guard < 4000; guard++) {
idx = rng.randint(0, SIZE_MIN_1); idx = rng.randint(0, SIZE_MIN_1);
if (g.isClue(idx)) continue; if (g.isClue(idx)) continue;
var d = OFFSETS_FOUR[rng.randint2bit()]; int d_idx = rng.randint2bit();
val packed = OFFSETS_D_IDX[d_idx | idx << 2];
if (g.hasRoomForClue(d.path()[idx])) { if (g.hasRoomForClue(packed)) {
g.setClue(idx, d.dbyte()); g.setClue(idx, (byte) (1 + (d_idx | 48)));
placed++; placed++;
} }
} }
@@ -479,12 +475,12 @@ public record SwedishGenerator(Rng rng) {
var g = grid.deepCopyGrid(); var g = grid.deepCopyGrid();
int ri; int ri;
var bytes = MUTATE_RI[rng.randint(0, SIZE_MIN_1)]; var bytes = MUTATE_RI[rng.randint(0, SIZE_MIN_1)];
nbrs_16 d;
for (var k = 0; k < 4; k++) { for (var k = 0; k < 4; k++) {
ri = bytes[rng.randint(0, 624)]; ri = bytes[rng.randint(0, 624)];
if (!g.clueless(ri)) { if (!g.clueless(ri)) {
d = OFFSETS_FOUR[rng.randint2bit()]; int d_idx = rng.randint2bit();
if (g.hasRoomForClue(d.path()[ri])) g.setClue(ri, d.dbyte()); val packed = OFFSETS_D_IDX[d_idx | ri << 2];
if (g.hasRoomForClue(packed)) g.setClue(ri, (byte) (1 + (d_idx | 48)));
} }
} }
return g; return g;

9
src/main/java/puzzle/TestGen.java
View File

@@ -3,13 +3,4 @@ package puzzle;
import precomp.Neighbors9x8; import precomp.Neighbors9x8;
public class TestGen { public class TestGen {
static void main() {
var cell = Neighbors9x8.IT[0];
long n1 = cell.n1();
long n2 = cell.n2();
int count = cell.nbrCount();
// of direct je offsets:
var up = Neighbors9x8.OFFSETS[1];
}
} }

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

@@ -167,7 +167,7 @@ public class MainTest {
// Regression baseline for seed search starting at 12347, pop 4, gens 20 // Regression baseline for seed search starting at 12347, pop 4, gens 20
Assertions.assertEquals(12348, foundSeed, "Found seed changed"); Assertions.assertEquals(12348, foundSeed, "Found seed changed");
Assertions.assertEquals(18, res.filled().clueMap().size(), "Number of assigned words changed"); Assertions.assertEquals(18, res.filled().clueMap().size(), "Number of assigned words changed");
Assertions.assertEquals("RIJTUIG", Lemma.asWord( res.filled().clueMap().get(74))); Assertions.assertEquals("TEN", Lemma.asWord(res.filled().clueMap().get(2)));
Assertions.assertEquals(301794542151533187L, res.filled().grid().grid().lo); Assertions.assertEquals(301794542151533187L, res.filled().grid().grid().lo);
Assertions.assertEquals(193L, res.filled().grid().grid().hi); Assertions.assertEquals(193L, res.filled().grid().grid().hi);
} }

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

@@ -73,12 +73,12 @@ public class SwedishGeneratorTest {
assertEquals('A', grid.byteAt(0)); assertEquals('A', grid.byteAt(0));
assertEquals(1, grid.digitAt(Grid.offset(0, 1))); assertEquals(1, grid.digitAt(Grid.offset(0, 1)));
assertTrue(grid.isLetterAt(0)); assertTrue(grid.notClue(0));
assertFalse(grid.isClue(0)); assertFalse(grid.isClue(0));
assertTrue(grid.isClue(Grid.offset(0, 1))); assertTrue(grid.isClue(Grid.offset(0, 1)));
assertFalse(grid.isLetterAt(Grid.offset(0, 1))); assertFalse(grid.notClue(Grid.offset(0, 1)));
assertTrue(grid.isLetterAt(0)); assertTrue(grid.notClue(0));
assertFalse(grid.isLetterAt(Grid.offset(0, 1))); assertFalse(grid.notClue(Grid.offset(0, 1)));
var copy = grid.deepCopyGrid(); var copy = grid.deepCopyGrid();
assertEquals('A', copy.byteAt(0)); assertEquals('A', copy.byteAt(0));