This commit is contained in:
mike
2026-01-23 21:20:08 +01:00
parent 7e34276726
commit e9d787bbb9
6 changed files with 91 additions and 95 deletions

View File

@@ -106,7 +106,7 @@ public class MainTest {
assertEquals(1, slots.length);
var s = slots[0];
assertEquals(8, Masker.Slot.length(s.lo(), s.hi()));
var cells = Puzzle.cellWalk(s.key(), s.lo(), s.hi()).mapToObj(c -> Masker.IT[c]).toArray(rci[]::new);
var cells = Riddle.cellWalk(s.key(), s.lo(), s.hi()).mapToObj(c -> Masker.IT[c]).toArray(rci[]::new);
assertEquals(0, cells[1].r());
assertEquals(1, cells[1].c());
assertEquals(0, cells[2].r());

View File

@@ -5,7 +5,6 @@ import anno.DictGen;
import anno.Dictionaries;
import lombok.val;
import org.junit.jupiter.api.Test;
import puzzle.Export.Puzzle;
import puzzle.Export.Signa;
import puzzle.SwedishGenerator.Rng;
import puzzle.SwedishGenerator.Slotinfo;
@@ -202,7 +201,7 @@ public class PerformanceTest {
var slotChar = dir.slotChar;
display[cr][cc] = clueChar;
Puzzle.cellWalk(slot.key(), slot.lo(), slot.hi())
Riddle.cellWalk(slot.key(), slot.lo(), slot.hi())
.skip(1)
.forEach(idx -> {
var r = Masker.IT[idx].r();

View File

@@ -207,7 +207,7 @@ public class SwedishGeneratorTest {
assertEquals(OFF_2_3, Slot.clueIndex(r2c3d0.slotKey));
assertEquals(CLUE_DOWN0, Slot.dir(r2c3d0.slotKey));
assertFalse(Slot.horiz(r2c3d0.slotKey));
var cells = Puzzle.cellWalk( r2c3d0.slotKey, r2c5.or(r3c5).or(r4c5).lo(), 0L).mapToObj(i -> Masker.IT[i]).toArray(rci[]::new);
var cells = Riddle.cellWalk(r2c3d0.slotKey, r2c5.or(r3c5).or(r4c5).lo(), 0L).mapToObj(i -> Masker.IT[i]).toArray(rci[]::new);
assertEquals(2, cells[1].r());
assertEquals(5, cells[1].c());
assertEquals(3, cells[2].r());