Gather data

This commit is contained in:
mike
2026-01-09 04:01:57 +01:00
parent 30678b06d9
commit 29b32d9550
2 changed files with 22 additions and 22 deletions

View File

@@ -502,7 +502,7 @@ public record SwedishGenerator(int[] buff) {
return penalty;
}
SwedishGenerator.Grid randomMask(SwedishGenerator.Rng rng) {
Grid randomMask(Rng rng) {
var g = makeEmptyGrid();
int placed = 0, guard = 0;
@@ -683,7 +683,6 @@ public record SwedishGenerator(int[] buff) {
}
// ---------------- Fill (CSP) ----------------
@Data
public static final class FillStats {
public long nodes;
@@ -692,11 +691,11 @@ public record SwedishGenerator(int[] buff) {
public int lastMRV;
}
record Pick(SwedishGenerator.Slot slot, SwedishGenerator.CandidateInfo info, boolean done) { }
record Pick(Slot slot, CandidateInfo info, boolean done) { }
public static record FillResult(boolean ok,
Gridded grid,
HashMap<Integer, SwedishGenerator.Lemma> clueMap,
HashMap<Integer, Lemma> clueMap,
FillStats stats,
double simplicity) {
@@ -744,7 +743,7 @@ public record SwedishGenerator(int[] buff) {
return 1;
}
public FillResult fillMask(Rng rng, Grid mask, SwedishGenerator.DictEntry[] dictIndex,
public FillResult fillMask(Rng rng, Grid mask, DictEntry[] dictIndex,
int logEveryMs, int timeLimitMs, boolean verbose) {
boolean multiThreaded = Thread.currentThread().getName().contains("pool");
var grid = mask.deepCopyGrid();