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 04:02:51 +01:00
parent ed7cade1c7
commit 4109c51cbe
8 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import anno.DictGen;
import lombok.val;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import gen.rci;
import precomp.Neighbors9x8;
import puzzle.Export.Vestigium;
import puzzle.Export.Signa;
import puzzle.Export.Puzzle;
@@ -180,13 +180,13 @@ public class MainTest {
r7c0d2, r7c1d1, r7c4d2, r7c5d2, r7c8d3
);
var slotInfo = mask.slots(DictData950.DICT950);
var grid = Slotinfo.grid(slotInfo);
var grid = Masker.grid(slotInfo, Neighbors9x8.SIZE);
var filled = fillMask(rng, slotInfo, grid.lo, grid.hi, grid.g);
Assertions.assertTrue(filled.ok(), "Puzzle generation failed (not ok)");
Assertions.assertEquals(17, Slotinfo.wordCount(0, slotInfo), "Number of assigned words changed");
Assertions.assertEquals("BEADEMT", Lemma.asWord(slotInfo[0].assign().w, Export.BYTES.get()));
Assertions.assertEquals(74732156493031040L, grid.lo);
Assertions.assertEquals(-63L, grid.hi);
Assertions.assertEquals(193L, grid.hi);
var g = new Puzzle(grid, mask.c());
g.gridToString();
var aa = new PuzzleResult(mask, g, slotInfo, filled).exportFormatFromFilled(new Rewards(1, 1, 1));

5
src/test/java/puzzle/PerformanceTest.java
View File

@@ -5,6 +5,7 @@ import anno.DictGen;
import anno.Dictionaries;
import lombok.val;
import org.junit.jupiter.api.Test;
import precomp.Neighbors9x8;
import puzzle.Export.Clue;
import puzzle.Export.Signa;
import puzzle.Export.Puzzle;
@@ -72,7 +73,7 @@ public class PerformanceTest {
for (var i = 0; i < iterations; i++) {
val slotInfo = Masker.slots(arr[c], DICT800);
var grid = Slotinfo.grid(slotInfo);
var grid = Masker.grid(slotInfo, Neighbors9x8.SIZE);
val result = fillMask(rng, slotInfo,grid.lo,grid.hi, grid.g);
if (result.ok()) successCount++;
totalNodes += result.nodes();
@@ -142,7 +143,7 @@ public class PerformanceTest {
// Reset assignments for each iteration
for (var s : slots) s.assign().w = 0;
var grid = Slotinfo.grid(slots);
var grid = Masker.grid(slots, Neighbors9x8.SIZE);
val result = fillMask(rng, slots, grid.lo,grid.hi,grid.g);
if (result.ok()) {
successCount++;

1
src/test/java/puzzle/SwedishGeneratorTest.java
View File

@@ -8,7 +8,6 @@ import lombok.val;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import precomp.Neighbors9x8;
import gen.rci;
import puzzle.DictJavaGeneratorMulti.DictEntryDTO.IntListDTO;
import puzzle.Export.Signa;
import puzzle.Export.Puzzle;

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

@@ -1,15 +1,17 @@
package puzzle;
import puzzle.Masker_Neighbors4x3;
import gen.Test123X_Neighbors4x3;
import gen.Test123X_Neighbors9x8;
import lombok.val;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import puzzle.Export.Puzzle;
import puzzle.Export.PuzzleResult;
import puzzle.Export.Rewards;
import puzzle.Export.Signa;
import puzzle.Export.Vestigium;
import puzzle.SwedishGenerator.Rng;
import puzzle.dict800.DictData800;
import puzzle.dict950.DictData950;
import java.util.stream.Collectors;
import static precomp.Const9x8.Cell.r0c0d1;
import static precomp.Const9x8.Cell.r1c0d1;
@@ -33,8 +35,9 @@ public class TestDuplication {
Assertions.assertEquals(4, mask.clueCount());
val map = mask.stream().collect(Collectors.toMap(Vestigium::index, Vestigium::clue));
Assertions.assertEquals(4, map.size());
var slots = Masker_Neighbors4x3.slots(mask.c(), DictData800.DICT800);
// 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));
var slots = Masker_Neighbors4x3.slots(mask.c(), DictData800.DICT800);
var grid = Masker_Neighbors4x3.grid(slots, Masker_Neighbors4x3.SIZE);
var filled = SwedishGenerator.fillMask(new Rng(1), slots, grid.lo, grid.hi, grid.g);
val res = new PuzzleResult(new Signa(mask.c()), new Puzzle(grid, mask.c()), slots, filled).exportFormatFromFilled(new Rewards(0, 0, 0));
}
}