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-20 03:43:02 +01:00
parent 28f448d178
commit 0dcfbebcb0
3 changed files with 263 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/main/java/puzzle/Masker.java
View File

@@ -50,15 +50,21 @@ public final class Masker {
long sLo = PATH_LO[key], sHi = PATH_HI[key]; long sLo = PATH_LO[key], sHi = PATH_HI[key];
long hLo = sLo & grid.lo, hHi = sHi & grid.hi; long hLo = sLo & grid.lo, hHi = sHi & grid.hi;
if (Slotinfo.increasing(key)) { if (Slotinfo.increasing(key)) {
if (hLo != X) { sLo &= (1L << numberOfTrailingZeros(hLo)) - 1; sHi = 0; } if (hLo != X) {
else if (hHi != X) { sHi &= (1L << numberOfTrailingZeros(hHi)) - 1; } sLo &= (1L << numberOfTrailingZeros(hLo)) - 1;
sHi = 0;
} else if (hHi != X) { sHi &= (1L << numberOfTrailingZeros(hHi)) - 1; }
} else { } else {
if (hHi != X) { sHi &= -(1L << (63 - numberOfLeadingZeros(hHi)) << 1); sLo = 0; } if (hHi != X) {
else if (hLo != X) { sLo &= -(1L << (63 - numberOfLeadingZeros(hLo)) << 1); } sHi &= -(1L << (63 - numberOfLeadingZeros(hHi)) << 1);
sLo = 0;
} else if (hLo != X) { sLo &= -(1L << (63 - numberOfLeadingZeros(hLo)) << 1); }
} }
if (bitCount(sLo) + bitCount(sHi) < minLen) return idx; if (bitCount(sLo) + bitCount(sHi) < minLen) return idx;
for (int j = 0; j < n; j++) if (bitCount(sLo & activeSLo[j]) + bitCount(sHi & activeSHi[j]) > 1) return idx; for (int j = 0; j < n; j++) if (bitCount(sLo & activeSLo[j]) + bitCount(sHi & activeSHi[j]) > 1) return idx;
activeSLo[n] = sLo; activeSHi[n] = sHi; n++; activeSLo[n] = sLo;
activeSHi[n] = sHi;
n++;
} }
return -1; return -1;
} }
@@ -318,8 +324,7 @@ public final class Masker {
int maxReached = 0; int maxReached = 0;
long totalReachedLo = 0, totalReachedHi = 0; long totalReachedLo = 0, totalReachedHi = 0;
for (int i = 0; i < numClues; i++) { for (int i = 0; i < numClues; i++) {
if (i < 64) { if ((totalReachedLo & (1L << i)) != 0) continue; } if (i < 64) { if ((totalReachedLo & (1L << i)) != 0) continue; } else { if ((totalReachedHi & (1L << (i - 64))) != 0) continue; }
else { if ((totalReachedHi & (1L << (i - 64))) != 0) continue; }
long currentReachedLo = (i < 64) ? (1L << i) : 0; long currentReachedLo = (i < 64) ? (1L << i) : 0;
long currentReachedHi = (i >= 64) ? (1L << (i - 64)) : 0; long currentReachedHi = (i >= 64) ? (1L << (i - 64)) : 0;
@@ -385,10 +390,10 @@ public final class Masker {
long vNbrLo = ((nclLo & ~0x0101010101010101L) >> 1) | ((nclLo & ~0x8080808080808080L) << 1); long vNbrLo = ((nclLo & ~0x0101010101010101L) >> 1) | ((nclLo & ~0x8080808080808080L) << 1);
long vNbrHi = ((nclHi & ~0x01L) >> 1) | ((nclHi & ~0x80L) << 1); long vNbrHi = ((nclHi & ~0x01L) >> 1) | ((nclHi & ~0x80L) << 1);
penalty += bitCount(nclLo & ~cHLo & hNbrLo) * 800; //penalty += bitCount(nclLo & ~cHLo & hNbrLo) * 800;
penalty += bitCount(nclLo & ~cVLo & vNbrLo) * 800; //penalty += bitCount(nclLo & ~cVLo & vNbrLo) * 800;
penalty += bitCount(nclHi & ~cHHi & hNbrHi) * 800; //penalty += bitCount(nclHi & ~cHHi & hNbrHi) * 800;
penalty += bitCount(nclHi & ~cVHi & vNbrHi) * 800; //penalty += bitCount(nclHi & ~cVHi & vNbrHi) * 800;
return penalty; return penalty;
} }
@@ -424,7 +429,7 @@ public final class Masker {
public Clues mutate(Clues c) { public Clues mutate(Clues c) {
var bytes = MUTATE_RI[rng.randint0_SIZE()]; var bytes = MUTATE_RI[rng.randint0_SIZE()];
for (int k = 0, ri; k < 4; k++) { for (int k = 0, ri; k < 6; k++) {
ri = bytes[rng.randint0_624()]; ri = bytes[rng.randint0_624()];
if (c.notClue(ri)) { // ADD if (c.notClue(ri)) { // ADD
byte d = rng.randomClueDir(); byte d = rng.randomClueDir();
@@ -433,17 +438,31 @@ public final class Masker {
if (isLo(ri)) { if (isLo(ri)) {
c.setClueLo(1L << ri, d); c.setClueLo(1L << ri, d);
if (!isValid(c, MIN_LEN)) c.clearClueLo(~(1L << ri)); if (!isValid(c, MIN_LEN)) c.clearClueLo(~(1L << ri));
else continue;
} else { } else {
c.setClueHi(1L << (ri & 63), d); c.setClueHi(1L << (ri & 63), d);
if (!isValid(c, MIN_LEN)) c.clearClueHi(~(1L << (ri & 63))); if (!isValid(c, MIN_LEN)) c.clearClueHi(~(1L << (ri & 63)));
else continue;
} }
} }
} else { // HAS CLUE } else { // HAS CLUE
var op = rng.randomClueDir(); var op = rng.randomClueDir();
if (op < 2) { // REMOVE if (op < 2) { // REMOVE
if (isLo(ri)) c.clearClueLo(~(1L << ri)); byte oldD = c.getDir(ri);
else c.clearClueHi(~(1L << (ri & 63))); if (isLo(ri)) {
} else if (op < 5) { // CHANGE DIRECTION c.clearClueLo(~(1L << ri));
if (!isValid(c, MIN_LEN)) c.setClueLo(1L << ri, oldD);
else continue;
} else {
c.clearClueHi(~(1L << (ri & 63)));
if (!isValid(c, MIN_LEN)) c.setClueHi(1L << (ri & 63), oldD);
else continue;
}
/* if (isLo(ri)) c.clearClueLo(~(1L << ri));
else c.clearClueHi(~(1L << (ri & 63)));*/
}
if (op < 4) { // CHANGE DIRECTION
byte d = rng.randomClueDir(); byte d = rng.randomClueDir();
int key = Slot.packSlotKey(ri, d); int key = Slot.packSlotKey(ri, d);
if (c.hasRoomForClue(key)) { if (c.hasRoomForClue(key)) {
@@ -451,12 +470,14 @@ public final class Masker {
if (isLo(ri)) { if (isLo(ri)) {
c.setClueLo(1L << ri, d); c.setClueLo(1L << ri, d);
if (!isValid(c, MIN_LEN)) c.setClueLo(1L << ri, oldD); if (!isValid(c, MIN_LEN)) c.setClueLo(1L << ri, oldD);
else continue;
} else { } else {
c.setClueHi(1L << (ri & 63), d); c.setClueHi(1L << (ri & 63), d);
if (!isValid(c, MIN_LEN)) c.setClueHi(1L << (ri & 63), oldD); if (!isValid(c, MIN_LEN)) c.setClueHi(1L << (ri & 63), oldD);
else continue;
} }
} }
} else { // MOVE } // MOVE
int nri = bytes[rng.randint0_624()]; int nri = bytes[rng.randint0_624()];
if (c.notClue(nri)) { if (c.notClue(nri)) {
byte d = c.getDir(ri); byte d = c.getDir(ri);
@@ -471,8 +492,7 @@ public final class Masker {
else c.clearClueHi(~(1L << (nri & 63))); else c.clearClueHi(~(1L << (nri & 63)));
if (isLo(ri)) c.setClueLo(1L << ri, d); if (isLo(ri)) c.setClueLo(1L << ri, d);
else c.setClueHi(1L << (ri & 63), d); else c.setClueHi(1L << (ri & 63), d);
} } else continue;
}
} }
} }
} }
@@ -675,15 +695,21 @@ public final class Masker {
long sLo = PATH_LO[key], sHi = PATH_HI[key]; long sLo = PATH_LO[key], sHi = PATH_HI[key];
long hLo = sLo & lo, hHi = sHi & hi; long hLo = sLo & lo, hHi = sHi & hi;
if (Slotinfo.increasing(key)) { if (Slotinfo.increasing(key)) {
if (hLo != X) { sLo &= (1L << numberOfTrailingZeros(hLo)) - 1; sHi = 0; } if (hLo != X) {
else if (hHi != X) { sHi &= (1L << numberOfTrailingZeros(hHi)) - 1; } sLo &= (1L << numberOfTrailingZeros(hLo)) - 1;
sHi = 0;
} else if (hHi != X) { sHi &= (1L << numberOfTrailingZeros(hHi)) - 1; }
} else { } else {
if (hHi != X) { sHi &= -(1L << (63 - numberOfLeadingZeros(hHi)) << 1); sLo = 0; } if (hHi != X) {
else if (hLo != X) { sLo &= -(1L << (63 - numberOfLeadingZeros(hLo)) << 1); } sHi &= -(1L << (63 - numberOfLeadingZeros(hHi)) << 1);
sLo = 0;
} else if (hLo != X) { sLo &= -(1L << (63 - numberOfLeadingZeros(hLo)) << 1); }
} }
if (bitCount(sLo) + bitCount(sHi) < minLen) return idx; if (bitCount(sLo) + bitCount(sHi) < minLen) return idx;
for (int i = 0; i < n; i++) if (bitCount(sLo & slo[i]) + bitCount(sHi & shi[i]) > 1) return idx; for (int i = 0; i < n; i++) if (bitCount(sLo & slo[i]) + bitCount(sHi & shi[i]) > 1) return idx;
slo[n] = sLo; shi[n] = sHi; n++; slo[n] = sLo;
shi[n] = sHi;
n++;
} }
for (long bits = hi; bits != X; bits &= bits - 1) { for (long bits = hi; bits != X; bits &= bits - 1) {
int idx = 64 | numberOfTrailingZeros(bits); int idx = 64 | numberOfTrailingZeros(bits);
@@ -692,15 +718,21 @@ public final class Masker {
long sLo = PATH_LO[key], sHi = PATH_HI[key]; long sLo = PATH_LO[key], sHi = PATH_HI[key];
long hLo = sLo & lo, hHi = sHi & hi; long hLo = sLo & lo, hHi = sHi & hi;
if (Slotinfo.increasing(key)) { if (Slotinfo.increasing(key)) {
if (hLo != X) { sLo &= (1L << numberOfTrailingZeros(hLo)) - 1; sHi = 0; } if (hLo != X) {
else if (hHi != X) { sHi &= (1L << numberOfTrailingZeros(hHi)) - 1; } sLo &= (1L << numberOfTrailingZeros(hLo)) - 1;
sHi = 0;
} else if (hHi != X) { sHi &= (1L << numberOfTrailingZeros(hHi)) - 1; }
} else { } else {
if (hHi != X) { sHi &= -(1L << (63 - numberOfLeadingZeros(hHi)) << 1); sLo = 0; } if (hHi != X) {
else if (hLo != X) { sLo &= -(1L << (63 - numberOfLeadingZeros(hLo)) << 1); } sHi &= -(1L << (63 - numberOfLeadingZeros(hHi)) << 1);
sLo = 0;
} else if (hLo != X) { sLo &= -(1L << (63 - numberOfLeadingZeros(hLo)) << 1); }
} }
if (bitCount(sLo) + bitCount(sHi) < minLen) return idx; if (bitCount(sLo) + bitCount(sHi) < minLen) return idx;
for (int i = 0; i < n; i++) if (bitCount(sLo & slo[i]) + bitCount(sHi & shi[i]) > 1) return idx; for (int i = 0; i < n; i++) if (bitCount(sLo & slo[i]) + bitCount(sHi & shi[i]) > 1) return idx;
slo[n] = sLo; shi[n] = sHi; n++; slo[n] = sLo;
shi[n] = sHi;
n++;
} }
return -1; return -1;
} }

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

@@ -40,7 +40,7 @@ public record SwedishGenerator() {
public static final int MAX_WORD_LENGTH = Config.PUZZLE_ROWS; public static final int MAX_WORD_LENGTH = Config.PUZZLE_ROWS;
public static final int MAX_WORD_LENGTH_PLUS_ONE = MAX_WORD_LENGTH + 1; public static final int MAX_WORD_LENGTH_PLUS_ONE = MAX_WORD_LENGTH + 1;
public static final int MIN_LEN = 2;//Neighbors9x8.MIN_LEN;//Config.MIN_LEN; public static final int MIN_LEN = 2;//Neighbors9x8.MIN_LEN;//Config.MIN_LEN;
public static final int MAX_TRIES_PER_SLOT = 1200;//Config.MAX_TRIES_PER_SLOT; public static final int MAX_TRIES_PER_SLOT = 700;//Config.MAX_TRIES_PER_SLOT;
public static final int STACK_SIZE = 128; public static final int STACK_SIZE = 128;
public static final long RANGE_0_SIZE = Neighbors9x8.RANGE_0_SIZE;// (long) SIZE_MIN_1 - 0L + 1L public static final long RANGE_0_SIZE = Neighbors9x8.RANGE_0_SIZE;// (long) SIZE_MIN_1 - 0L + 1L
public static final long RANGE_0_624 = Neighbors9x8.RANGE_0_624;//624L - 0L + 1L; public static final long RANGE_0_624 = Neighbors9x8.RANGE_0_624;//624L - 0L + 1L;

51
src/test/java/puzzle/MaskerCluesTest.java
View File

@@ -1,7 +1,9 @@
package puzzle; package puzzle;
import module java.base; import module java.base;
import lombok.val;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import puzzle.Export.Clued;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import static puzzle.Masker.Clues; import static puzzle.Masker.Clues;
import static puzzle.SwedishGenerator.*; import static puzzle.SwedishGenerator.*;
@@ -9,6 +11,55 @@ import static puzzle.Masker.Slot;
public class MaskerCluesTest { public class MaskerCluesTest {
@Test
void testValidRandomMask() {
Rng rng = new Rng(42);
Masker masker = new Masker(rng, new int[STACK_SIZE], Clues.createEmpty());
for (int i = 0; i < 200; i++) {
for (int j = 19; j < 24; j++) {
var clues = masker.randomMask(j);
assertTrue(clues.isValid(MIN_LEN), "Mask should be valid for length \n" + new Clued(clues).gridToString());
}
}
}
@Test
void testValidMutate() {
Rng rng = new Rng(42);
var cache = Clues.createEmpty();
Masker masker = new Masker(rng, new int[STACK_SIZE], cache);
double sim = 0.0;
double simCount = 0.0;
for (int i = 0; i < 200; i++) {
for (int j = 19; j < 24; j++) {
var clues = masker.randomMask(j);
val orig = cache.from(clues);
simCount++;
masker.mutate(clues);
sim += orig.similarity(clues);
assertTrue(clues.isValid(MIN_LEN), "Mask should be valid for length \n" + new Clued(clues).gridToString());
}
}
System.out.println("Average similarity: " + sim / simCount);
}
@Test
void testCross() {
Rng rng = new Rng(42);
var cache = Clues.createEmpty();
Masker masker = new Masker(rng, new int[STACK_SIZE], cache);
double sim = 0.0;
double simCount = 0.0;
for (int i = 0; i < 200; i++) {
for (int j = 19; j < 24; j++) {
var clues = masker.randomMask(j);
var clues2 = masker.randomMask(j);
simCount++;
var cross = masker.crossover(clues, clues2);
sim += Math.max(cross.similarity(clues), cross.similarity(clues2));
assertTrue(cross.isValid(MIN_LEN), "Mask should be valid for length \n" + new Clued(cross).gridToString());
}
}
System.out.println("Average similarity: " + sim / simCount);
}
@Test @Test
void testSimilarity() { void testSimilarity() {
Clues a = Clues.createEmpty(); Clues a = Clues.createEmpty();