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

Gather data

Browse Source
This commit is contained in:
mike
2026-01-09 03:41:51 +01:00
parent 5bfea6f116
commit 30678b06d9
6 changed files with 157 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
src/test/java/puzzle/ExportFormatTest.java
View File

@@ -2,6 +2,7 @@ package puzzle;
import org.junit.jupiter.api.Test;
import puzzle.ExportFormat.ExportedPuzzle;
import puzzle.ExportFormat.Gridded;
import puzzle.ExportFormat.Rewards;
import puzzle.Main.PuzzleResult;
import puzzle.SwedishGenerator.FillResult;
@@ -13,82 +14,82 @@ import java.util.HashMap;
import static org.junit.jupiter.api.Assertions.*;
public class ExportFormatTest {
@Test
void testExportFormatFromFilled() {
var swe = new SwedishGenerator();
var grid = SwedishGenerator.makeEmptyGrid();
// Place a '2' (right) at (0,0)
grid.setCharAt(0, 0, '2');
// This creates a slot starting at (0,1)
var clueMap = new HashMap<Integer, Lemma>();
// key = (r << 8) | (c << 4) | d
int key = (0 << 8) | (0 << 4) | 2;
Lemma lemma = new Lemma("TEST", 1, "A test word");
clueMap.put(key, lemma);
// Manually fill the grid letters for "TEST" at (0,1), (0,2), (0,3), (0,4)
grid.setCharAt(0, 1, 'T');
grid.setCharAt(0, 2, 'E');
grid.setCharAt(0, 3, 'S');
grid.setCharAt(0, 4, 'T');
// Terminate the slot at (0,5) with another digit to avoid it extending to MAX_WORD_LENGTH
grid.setCharAt(0, 5, '1');
var fillResult = new FillResult(true, grid, clueMap, null);
var puzzleResult = new PuzzleResult(swe, null, null, fillResult);
Rewards rewards = new Rewards(10, 5, 1);
ExportedPuzzle exported = ExportFormat.exportFormatFromFilled(puzzleResult, 2, rewards);
assertNotNull(exported);
assertEquals(2, exported.difficulty());
assertEquals(rewards, exported.rewards());
// Check words
assertEquals(1, exported.words().length);
var w = exported.words()[0];
assertEquals("TEST", w.word());
assertEquals("h", w.direction());
// The bounding box should include (0,0) for the arrow and (0,1)-(0,4) for the word.
// minR=0, maxR=0, minC=0, maxC=4
// startRow = 0 - minR = 0
// startCol = 1 - minC = 1
assertEquals(0, w.startRow());
assertEquals(1, w.startCol());
assertEquals(0, w.arrowRow());
assertEquals(0, w.arrowCol());
// Check gridv2
// It should be 1 row, containing "2TEST" -> but letters are mapped, digits are not explicitly in letterAt.
// Wait, look at exportFormatFromFilled logic:
// row.append(letterAt.getOrDefault(pack(r, c), '#'));
// letterAt only contains letters from placed words.
// arrow cells are NOT in letterAt unless they are also part of a word (unlikely).
// So (0,0) should be '#'
assertEquals(1, exported.gridv2().size());
assertEquals("#TEST", exported.gridv2().get(0));
}
@Test
void testExportFormatEmpty() {
var swe = new SwedishGenerator();
var grid = SwedishGenerator.makeEmptyGrid();
var fillResult = new FillResult(true, grid, new HashMap<>(), null);
var puzzleResult = new PuzzleResult(swe, null, null, fillResult);
ExportedPuzzle exported = ExportFormat.exportFormatFromFilled(puzzleResult, 1, new Rewards(0,0,0));
assertNotNull(exported);
assertEquals(0, exported.words().length);
// Should return full grid with '#'
assertEquals(SwedishGenerator.R, exported.gridv2().size());
for (String row : exported.gridv2()) {
assertEquals(SwedishGenerator.C, row.length());
assertTrue(row.matches("#+"));
}
}
@Test
void testExportFormatFromFilled() {
var swe = new SwedishGenerator();
var grid = SwedishGenerator.makeEmptyGrid();
// Place a '2' (right) at (0,0)
grid.setByteAt(0, 0, (byte) '2');
// This creates a slot starting at (0,1)
var clueMap = new HashMap<Integer, Lemma>();
// key = (r << 8) | (c << 4) | d
int key = (0 << 8) | (0 << 4) | 2;
Lemma lemma = new Lemma("TEST", 1, "A test word");
clueMap.put(key, lemma);
// Manually fill the grid letters for "TEST" at (0,1), (0,2), (0,3), (0,4)
grid.setByteAt(0, 1, (byte) 'T');
grid.setByteAt(0, 2, (byte) 'E');
grid.setByteAt(0, 3, (byte) 'S');
grid.setByteAt(0, 4, (byte) 'T');
// Terminate the slot at (0,5) with another digit to avoid it extending to MAX_WORD_LENGTH
grid.setByteAt(0, 5, (byte) '1');
var fillResult = new FillResult(true, new Gridded(grid), clueMap, null);
var puzzleResult = new PuzzleResult(swe, null, null, fillResult);
Rewards rewards = new Rewards(10, 5, 1);
ExportedPuzzle exported = ExportFormat.exportFormatFromFilled(puzzleResult, 2, rewards);
assertNotNull(exported);
assertEquals(2, exported.difficulty());
assertEquals(rewards, exported.rewards());
// Check words
assertEquals(1, exported.words().length);
var w = exported.words()[0];
assertEquals("TEST", w.word());
assertEquals("h", w.direction());
// The bounding box should include (0,0) for the arrow and (0,1)-(0,4) for the word.
// minR=0, maxR=0, minC=0, maxC=4
// startRow = 0 - minR = 0
// startCol = 1 - minC = 1
assertEquals(0, w.startRow());
assertEquals(1, w.startCol());
assertEquals(0, w.arrowRow());
assertEquals(0, w.arrowCol());
// Check gridv2
// It should be 1 row, containing "2TEST" -> but letters are mapped, digits are not explicitly in letterAt.
// Wait, look at exportFormatFromFilled logic:
// row.append(letterAt.getOrDefault(pack(r, c), '#'));
// letterAt only contains letters from placed words.
// arrow cells are NOT in letterAt unless they are also part of a word (unlikely).
// So (0,0) should be '#'
assertEquals(1, exported.gridv2().size());
assertEquals("#TEST", exported.gridv2().get(0));
}
@Test
void testExportFormatEmpty() {
var swe = new SwedishGenerator();
var grid = SwedishGenerator.makeEmptyGrid();
var fillResult = new FillResult(true, new Gridded(grid), new HashMap<>(), null);
var puzzleResult = new PuzzleResult(swe, null, null, fillResult);
ExportedPuzzle exported = ExportFormat.exportFormatFromFilled(puzzleResult, 1, new Rewards(0, 0, 0));
assertNotNull(exported);
assertEquals(0, exported.words().length);
// Should return full grid with '#'
assertEquals(SwedishGenerator.R, exported.gridv2().size());
for (String row : exported.gridv2()) {
assertEquals(SwedishGenerator.C, row.length());
assertTrue(row.matches("#+"));
}
}
}

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

@@ -94,9 +94,9 @@ public class MainTest {
grid.setCharAt(1, 2, '5');
grid.setCharAt(2, 3, 'Z');
Assertions.assertEquals('A', grid.getCharAt(0, 0));
Assertions.assertEquals('5', grid.getCharAt(1, 2));
Assertions.assertEquals('Z', grid.getCharAt(2, 3));
Assertions.assertEquals((byte) 'A', grid.byteAt(0, 0));
Assertions.assertEquals((byte) '5', grid.byteAt(1, 2));
Assertions.assertEquals((byte) 'Z', grid.byteAt(2, 3));
Assertions.assertEquals(DASH, grid.byteAt(1, 1));
// Test isLetterAt
@@ -127,11 +127,11 @@ public class MainTest {
grid.setCharAt(1, 1, 'D');
var copy = grid.deepCopyGrid();
Assertions.assertEquals('A', copy.getCharAt(0, 0));
Assertions.assertEquals((byte) 'A', copy.byteAt(0, 0));
copy.setCharAt(0, 0, 'X');
Assertions.assertEquals('X', copy.getCharAt(0, 0));
Assertions.assertEquals('A', grid.getCharAt(0, 0)); // Original should be unchanged
Assertions.assertEquals((byte) 'X', copy.byteAt(0, 0));
Assertions.assertEquals((byte) 'A', grid.byteAt(0, 0)); // Original should be unchanged
}
@Test
@@ -168,7 +168,7 @@ public class MainTest {
System.out.println("[DEBUG_LOG] Simplicity: " + res.filled().simplicity());
System.out.println("[DEBUG_LOG] ClueMap Size: " + res.filled().clueMap().size());
System.out.println("[DEBUG_LOG] Grid:");
System.out.println(res.swe().renderHuman(res.filled().grid()));
System.out.println(res.filled().grid().renderHuman());
break;
}
}
@@ -193,8 +193,4 @@ public class MainTest {
assertTrue(SwedishGenerator.isLetter((byte) 'Z'));
}
@Test
public void testIsNotLetterLowercaseA() {
assertFalse(SwedishGenerator.isLetter((byte) 'a'));
}
}

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

@@ -72,7 +72,7 @@ public class SwedishGeneratorTest {
grid.setCharAt(0, 0, 'A');
grid.setCharAt(0, 1, '1');
assertEquals('A', grid.getCharAt(0, 0));
assertEquals('A', grid.byteAt(0, 0));
assertEquals(1, grid.digitAt(0, 1));
assertTrue(grid.isLetterAt(0, 0));
assertFalse(grid.isDigitAt(0, 0));
@@ -82,10 +82,10 @@ public class SwedishGeneratorTest {
assertFalse(grid.isLettercell(0, 1));
var copy = grid.deepCopyGrid();
assertEquals('A', copy.getCharAt(0, 0));
assertEquals('A', copy.byteAt(0, 0));
copy.setCharAt(0, 0, 'B');
assertEquals('B', copy.getCharAt(0, 0));
assertEquals('A', grid.getCharAt(0, 0));
assertEquals('B', copy.byteAt(0, 0));
assertEquals('A', grid.byteAt(0, 0));
}
@Test
@@ -266,9 +266,9 @@ public class SwedishGeneratorTest {
// 1. Successful placement in empty grid
int placed = SwedishGenerator.placeWord(grid, s, w1, undoBuffer, 0);
assertEquals(1, placed);
assertEquals('A', grid.getCharAt(0, 0));
assertEquals('B', grid.getCharAt(0, 1));
assertEquals('C', grid.getCharAt(0, 2));
assertEquals('A', grid.byteAt(0, 0));
assertEquals('B', grid.byteAt(0, 1));
assertEquals('C', grid.byteAt(0, 2));
assertEquals(0b111L, undoBuffer[0]);
// 2. Successful placement with partial overlap (same characters)
@@ -281,9 +281,9 @@ public class SwedishGeneratorTest {
placed = SwedishGenerator.placeWord(grid, s, w2, undoBuffer, 2);
assertEquals(-1, placed);
// Verify grid is unchanged (still "ABC")
assertEquals('A', grid.getCharAt(0, 0));
assertEquals('B', grid.getCharAt(0, 1));
assertEquals('C', grid.getCharAt(0, 2));
assertEquals('A', grid.byteAt(0, 0));
assertEquals('B', grid.byteAt(0, 1));
assertEquals('C', grid.byteAt(0, 2));
// 4. Partial placement then conflict (rollback)
grid = SwedishGenerator.makeEmptyGrid();
@@ -293,7 +293,7 @@ public class SwedishGeneratorTest {
// Verify grid is still empty (except for 'X')
assertEquals(SwedishGenerator.DASH, grid.byteAt(0, 0));
assertEquals(SwedishGenerator.DASH, grid.byteAt(0, 1));
assertEquals('X', grid.getCharAt(0, 2));
assertEquals('X', grid.byteAt(0, 2));
}
@Test
@@ -307,8 +307,8 @@ public class SwedishGeneratorTest {
var placed = SwedishGenerator.placeWord(grid, s, w, undoBuffer, 0);
assertEquals(1, placed);
assertEquals('A', grid.getCharAt(0, 1));
assertEquals('Z', grid.getCharAt(0, 2));
assertEquals('A', grid.byteAt(0, 1));
assertEquals('Z', grid.byteAt(0, 2));
assertEquals(0b11L, undoBuffer[0]);
SwedishGenerator.undoPlace(grid, s, undoBuffer[0]);