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-14 12:53:43 +01:00
parent ecf4ae913e
commit 0b7a59b769
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,8 +289,8 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
return lisLetterAtHi(pos); return lisLetterAtHi(pos);
} }
public boolean lisLetterAtLo(int pos) { return (lo & (1L << pos)) != 0; } public boolean lisLetterAtLo(int pos) { return (lo & (1L << pos)) != X; }
public boolean lisLetterAtHi(int pos) { return (hi & (1L << (pos & 63))) != 0; } public boolean lisLetterAtHi(int pos) { return (hi & (1L << (pos & 63))) != X; }
void setLetterLo(int idx, byte ch) { void setLetterLo(int idx, byte ch) {
lo |= (1L << idx); lo |= (1L << idx);
@@ -411,11 +411,11 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
if (Slot.increasing(key)) { if (Slot.increasing(key)) {
// first clue is lowest index among hits (lo first, then hi) // first clue is lowest index among hits (lo first, then hi)
if (hitsLo != 0) { if (hitsLo != X) {
long stop = 1L << Long.numberOfTrailingZeros(hitsLo); long stop = 1L << Long.numberOfTrailingZeros(hitsLo);
rayLo &= (stop - 1); rayLo &= (stop - 1);
rayHi = 0; // any hi is beyond the stop rayHi = 0; // any hi is beyond the stop
} else if (hitsHi != 0) { } else if (hitsHi != X) {
long stop = 1L << Long.numberOfTrailingZeros(hitsHi); long stop = 1L << Long.numberOfTrailingZeros(hitsHi);
// keep all lo (lo indices are < any hi index), but cut hi below stop // keep all lo (lo indices are < any hi index), but cut hi below stop
rayHi &= (stop - 1); rayHi &= (stop - 1);
@@ -471,7 +471,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
if (hLo != X) { if (hLo != X) {
rLo &= ((1L << Long.numberOfTrailingZeros(hLo)) - 1); rLo &= ((1L << Long.numberOfTrailingZeros(hLo)) - 1);
rHi = 0; rHi = 0;
} else if (hHi != 0) { rHi &= ((1L << Long.numberOfTrailingZeros(hHi)) - 1); } } else if (hHi != X) { rHi &= ((1L << Long.numberOfTrailingZeros(hHi)) - 1); }
} else { } else {
if (hHi != X) { if (hHi != X) {
int msb = 63 - Long.numberOfLeadingZeros(hHi); int msb = 63 - Long.numberOfLeadingZeros(hHi);
@@ -563,8 +563,8 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
int clueIdx = Long.numberOfTrailingZeros(bits); int clueIdx = Long.numberOfTrailingZeros(bits);
var rci = IT[clueIdx]; var rci = IT[clueIdx];
if ((4 - rci.nbrCount()) + Long.bitCount(rci.n1() & lo_cl) + Long.bitCount(rci.n2() & hi_cl) >= 3) penalty += 400; if ((4 - rci.nbrCount()) + Long.bitCount(rci.n1() & lo_cl) + Long.bitCount(rci.n2() & hi_cl) >= 3) penalty += 400;
boolean h = (cHLo & (1L << clueIdx)) != 0; boolean h = (cHLo & (1L << clueIdx)) != X;
boolean v = (cVLo & (1L << clueIdx)) != 0; boolean v = (cVLo & (1L << clueIdx)) != X;
if (!h && !v) penalty += 1500; if (!h && !v) penalty += 1500;
else if (h && v) { /* ok */ } else if (h | v) penalty += 200; else if (h && v) { /* ok */ } else if (h | v) penalty += 200;
else penalty += 600; else penalty += 600;
@@ -573,8 +573,8 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
int clueIdx = Long.numberOfTrailingZeros(bits); int clueIdx = Long.numberOfTrailingZeros(bits);
var rci = IT[64 | clueIdx]; var rci = IT[64 | clueIdx];
if ((4 - rci.nbrCount()) + Long.bitCount(rci.n1() & lo_cl) + Long.bitCount(rci.n2() & hi_cl) >= 3) penalty += 400; if ((4 - rci.nbrCount()) + Long.bitCount(rci.n1() & lo_cl) + Long.bitCount(rci.n2() & hi_cl) >= 3) penalty += 400;
boolean h = (cHHi & (1L << clueIdx)) != 0; boolean h = (cHHi & (1L << clueIdx)) != X;
boolean v = (cVHi & (1L << clueIdx)) != 0; boolean v = (cVHi & (1L << clueIdx)) != X;
if (!h && !v) penalty += 1500; if (!h && !v) penalty += 1500;
else if (h && v) { /* ok */ } else if (h | v) penalty += 200; else if (h && v) { /* ok */ } else if (h | v) penalty += 200;
else penalty += 600; else penalty += 600;
@@ -772,7 +772,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
static boolean placeWord(Grid grid, final int key, final long lo, final long hi, final long w) { static boolean placeWord(Grid grid, final int key, final long lo, final long hi, final long w) {
final long glo = grid.lo, ghi = grid.hi; final long glo = grid.lo, ghi = grid.hi;
if (Slot.increasing(key)) { if (Slot.increasing(key)) {
for (long b = lo & glo; b != 0; b &= b - 1) { for (long b = lo & glo; b != X; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
if (grid.g[idx] != Lemma.byteAt(w, Long.bitCount(lo & ((1L << idx) - 1)))) return false; if (grid.g[idx] != Lemma.byteAt(w, Long.bitCount(lo & ((1L << idx) - 1)))) return false;
} }
@@ -808,7 +808,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
long maskLo = lo & ~glo, maskHi = hi & ~ghi; long maskLo = lo & ~glo, maskHi = hi & ~ghi;
if ((maskLo | maskHi) != X) { if ((maskLo | maskHi) != X) {
for (long b = maskHi; b != 0; b &= b - 1) { for (long b = maskHi; b != X; b &= b - 1) {
int idx = Long.numberOfTrailingZeros(b); int idx = Long.numberOfTrailingZeros(b);
grid.g[64 | idx] = Lemma.byteAt(w, Long.bitCount(hi & ~((1L << idx) | ((1L << idx) - 1)))); grid.g[64 | idx] = Lemma.byteAt(w, Long.bitCount(hi & ~((1L << idx) | ((1L << idx) - 1))));
} }
@@ -828,7 +828,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
for (long p = pattern; p != X; ) { for (long p = pattern; p != X; ) {
int combined = (int) (p & 0xFF); int combined = (int) (p & 0xFF);
if (combined != 0) { if (combined != X) {
long[] bs = posBitsets[combined - 1]; long[] bs = posBitsets[combined - 1];
if (first) { if (first) {
System.arraycopy(bs, 0, res, 0, numLongs); System.arraycopy(bs, 0, res, 0, numLongs);
@@ -864,7 +864,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) {
for (long p = pattern; p != X; ) { for (long p = pattern; p != X; ) {
int combined = (int) (p & 0xFF); int combined = (int) (p & 0xFF);
if (combined != 0) { if (combined != X) {
long[] bs = posBitsets[combined - 1]; long[] bs = posBitsets[combined - 1];
if (first) { if (first) {
System.arraycopy(bs, 0, res, 0, numLongs); System.arraycopy(bs, 0, res, 0, numLongs);