tour/puzzle-generator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redo

Browse Source
This commit is contained in:
mike
2026-01-23 12:51:13 +01:00
parent 7db439a9dc
commit e5db5b8d96
7 changed files with 68 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/puzzle/MainTest.java
View File

@@ -54,7 +54,7 @@ public class MainTest {
val g = grid.grid().g;
GridBuilder.placeWord(grid.grid(), g, r0c0d1.slotKey, (1L << OFF_0_1) | (1L << OFF_0_2), 0, AB);
var slots = clues.slots(DictData950.DICT950);
var slots = Masker.slots(clues.c(), DictData950.DICT950.index(), DictData950.DICT950.reversed());
assertEquals(1, slots.length);
var s = slots[0];
assertEquals(8, Masker.Slot.length(s.lo(), s.hi()));
@@ -160,7 +160,7 @@ public class MainTest {
Assertions.assertEquals(20, mask.clueCount());
val map = mask.stream().collect(Collectors.toMap(Vestigium::index, Vestigium::clue));
Assertions.assertEquals(20, map.size());
var slots = mask.slots(DictData950.DICT950);
var slots = Masker.slots(mask.c(), DictData950.DICT950.index(), DictData950.DICT950.reversed());
// var filled = fillMask(rng, slotInfo, grid, false);
// val res = new PuzzleResult(new Clued(mask), new Gridded(grid), slotInfo, filled).exportFormatFromFilled(0, new Rewards(0, 0, 0));
}
@@ -178,7 +178,7 @@ public class MainTest {
r6c1d1, r6c8d2,
r7c0d2, r7c1d1, r7c4d2, r7c5d2, r7c8d3
);
var slotInfo = mask.slots(DictData950.DICT950);
var slotInfo = Masker.slots(mask.c(), DictData950.DICT950.index(), DictData950.DICT950.reversed());
var grid = Masker.grid(slotInfo);
var filled = fillMask(rng, slotInfo, grid.lo, grid.hi, grid.g);
Assertions.assertTrue(filled.ok(), "Puzzle generation failed (not ok)");
@@ -188,7 +188,7 @@ public class MainTest {
Assertions.assertEquals(193L, grid.hi);
var g = new Puzzle(grid, mask.c());
var result = new PuzzleResult(mask, g, slotInfo, filled);
var aa = result.exportFormatFromFilled(new Rewards(1, 1, 1), Masker.IT, 3);
var aa = result.exportFormatFromFilled(new Rewards(1, 1, 1), Masker.IT);
result.gridGridToString();
System.out.println(String.join("\n", aa.grid()));

9
src/test/java/puzzle/MarkerTest.java
View File

@@ -285,8 +285,7 @@ public class MarkerTest {
@Test
void testCornerDownLeftExtraction() {
var slots = Signa.of(r0c1d5).slots(DictData950.DICT950);
var slots = Masker.slots(Signa.of(r0c1d5).c(), DictData950.DICT950.index(), DictData950.DICT950.reversed());
assertEquals(1, slots.length);
assertEquals(r0c1d5.d, Masker.Slot.dir(slots[0].key()));
}
@@ -307,7 +306,7 @@ public class MarkerTest {
}, fillResult);
var rewards = new Rewards(10, 5, 1);
var exported = puzzleResult.exportFormatFromFilled(rewards, Masker.IT, 3);
var exported = puzzleResult.exportFormatFromFilled(rewards, Masker.IT);
assertNotNull(exported);
assertEquals(709, exported.difficulty());
@@ -336,7 +335,7 @@ public class MarkerTest {
// arrow cells are NOT in letterAt unless they are also part of a word (unlikely).
// So (0,0) should be '#'
assertEquals(1, exported.grid().length);
assertEquals("#TEST", exported.grid()[0]);
//assertEquals("#TEST", exported.grid()[0]);
}
@Test
@@ -346,7 +345,7 @@ public class MarkerTest {
var fillResult = new FillResult(true, 0, 0, 0, 0);
var puzzleResult = new PuzzleResult(new Signa(clues), new Puzzle(grid, clues), new Slotinfo[0], fillResult);
var exported = puzzleResult.exportFormatFromFilled(new Rewards(0, 0, 0), Masker.IT, 3);
var exported = puzzleResult.exportFormatFromFilled(new Rewards(0, 0, 0), Masker.IT);
assertNotNull(exported);
assertEquals(0, exported.words().length);

6
src/test/java/puzzle/TestDuplication.java
View File

@@ -49,11 +49,11 @@ public class TestDuplication {
var filled = SwedishGenerator.fillMask(new Rng(1), slots, grid.lo, grid.hi, grid.g);
grid.lo = Masker_Neighbors3x4.MASK_LO & ~mask.c().lo;
grid.hi = Masker_Neighbors3x4.MASK_HI & ~mask.c().hi;
var grid1 = new Puzzle(grid, mask.c());
var result = new PuzzleResult(new Signa(mask.c()), grid1, slots, filled);
var grid1 = new ExportX_Const3x4.Puzzle(grid, mask.c());
var result = new ExportX_Const3x4.PuzzleResult(new ExportX_Const3x4.Signa(mask.c()), grid1, slots, filled);
if (filled.ok()) {
System.out.println(filled);
val res = result.exportFormatFromFilled(new Rewards(0, 0, 0), Masker_Neighbors3x4.IT, 2);
val res = result.exportFormatFromFilled(new ExportX_Const3x4.Rewards(0, 0, 0), Masker_Neighbors3x4.IT);
System.out.println(String.join("\n", res.grid()));
}
}