This commit is contained in:
mike
2026-01-23 01:55:12 +01:00
parent 2295a7d97c
commit dc45ad45c9
13 changed files with 210 additions and 731 deletions

View File

@@ -9,6 +9,7 @@ import puzzle.Export.Clue;
import puzzle.Export.Signa;
import puzzle.Export.Puzzle;
import puzzle.Masker.Clues;
import puzzle.SwedishGenerator.Grid;
import puzzle.SwedishGenerator.Rng;
import puzzle.SwedishGenerator.Slotinfo;
@@ -72,8 +73,9 @@ public class PerformanceTest {
var successCount = 0;
for (var i = 0; i < iterations; i++) {
val slotInfo = Masker.slots(arr[c], DICT800.index());
val result = fillMask(rng, slotInfo, Slotinfo.grid(slotInfo));
val slotInfo = Masker.slots(arr[c], DICT800);
var grid = Slotinfo.grid(slotInfo);
val result = fillMask(rng, slotInfo,grid.lo,grid.hi, grid.g);
if (result.ok()) successCount++;
totalNodes += result.nodes();
totalBacktracks += result.backtracks();
@@ -100,7 +102,7 @@ public class PerformanceTest {
r6c2d1,
r7c0d2, r7c1d2, r7c2d1, r7c7d2, r7c8d2
);
val allSlots = Masker.slots(mask.c(), DICT900.index());
val allSlots = Masker.slots(mask.c(), DICT900);
//mask.toGrid()
System.out.println("[DEBUG_LOG] \n--- Incremental Complexity Test ---");
System.out.println("[DEBUG_LOG] Full Slot Layout:");
@@ -121,7 +123,7 @@ public class PerformanceTest {
// A single horizontal slot at (0,0)
val mask = Signa.of(r0c0d1);
val slots = Masker.slots(mask.c(), DICT800.index());
val slots = Masker.slots(mask.c(), DICT800);
System.out.println("[DEBUG_LOG] \n--- Single Slot Resolution ---");
if (slots.length > 0) {
@@ -142,7 +144,8 @@ public class PerformanceTest {
// Reset assignments for each iteration
for (var s : slots) s.assign().w = 0;
val result = fillMask(rng, slots, Slotinfo.grid(slots));
var grid = Slotinfo.grid(slots);
val result = fillMask(rng, slots, grid.lo,grid.hi,grid.g);
if (result.ok()) {
successCount++;
}