Gather data

This commit is contained in:
mike
2026-01-09 01:08:25 +01:00
parent a269584ad6
commit c5d6a6db80
4 changed files with 140 additions and 69 deletions

View File

@@ -145,12 +145,12 @@ public class SwedishGeneratorTest {
assertEquals(3, s.clueC());
assertEquals(5, s.dir());
assertFalse(s.horiz());
assertEquals(2, s.r(0));
assertEquals(3, s.r(1));
assertEquals(4, s.r(2));
assertEquals(5, s.c(0));
assertEquals(5, s.c(1));
assertEquals(5, s.c(2));
assertEquals(2, Grid.r(s.pos(0)));
assertEquals(3, Grid.r(s.pos(1)));
assertEquals(4, Grid.r(s.pos(2)));
assertEquals(5, Grid.c(s.pos(0)));
assertEquals(5, Grid.c(s.pos(1)));
assertEquals(5, Grid.c(s.pos(2)));
assertTrue(Slot.horiz(2)); // right
assertFalse(Slot.horiz(3)); // down
@@ -261,26 +261,27 @@ public class SwedishGeneratorTest {
// Slot at (0,0) length 3, horizontal (right)
// key = (r << 8) | (c << 4) | d. Here we just need a valid slot for placeWord.
// r(i) and c(i) are used by placeWord.
var packedPos = ((long) Grid.offset(0, 0)) | (((long) Grid.offset(0, 1)) << 7) | (((long) Grid.offset(0, 2)) << 14);
var s = Slot.from(0, packedPos, 3);
var w1 = new Lemma("ABC", 1, "test");
var undoBuffer = new long[10];
var packedPos = ((long) Grid.offset(0, 0)) | (((long) Grid.offset(0, 1)) << 7) | (((long) Grid.offset(0, 2)) << 14);
var s = Slot.from(0, packedPos, 3);
var w1 = new Lemma("ABC", 1, "test");
var undoBuffer = new int[10];
// 1. Successful placement in empty grid
int placed = SwedishGenerator.placeWord(grid, s, w1, undoBuffer, 0);
assertEquals(3, placed);
assertEquals(1, placed);
assertEquals('A', grid.getCharAt(0, 0));
assertEquals('B', grid.getCharAt(0, 1));
assertEquals('C', grid.getCharAt(0, 2));
assertEquals(0b111L, undoBuffer[0]);
// 2. Successful placement with partial overlap (same characters)
// Clear grid first or use another slot. Let's just verify it works if we place it again.
placed = SwedishGenerator.placeWord(grid, s, w1, undoBuffer, 0);
assertEquals(0, placed); // 0 new characters placed
placed = SwedishGenerator.placeWord(grid, s, w1, undoBuffer, 1);
assertEquals(1, placed);
assertEquals(0L, undoBuffer[1]); // 0 new characters placed
// 3. Conflict: place "ABD" where "ABC" is
var w2 = new Lemma("ABD", 1, "conflict");
placed = SwedishGenerator.placeWord(grid, s, w2, undoBuffer, 0);
placed = SwedishGenerator.placeWord(grid, s, w2, undoBuffer, 2);
assertEquals(-1, placed);
// Verify grid is unchanged (still "ABC")
assertEquals('A', grid.getCharAt(0, 0));
@@ -290,7 +291,7 @@ public class SwedishGeneratorTest {
// 4. Partial placement then conflict (rollback)
grid = SwedishGenerator.makeEmptyGrid();
grid.setCharAt(0, 2, 'X'); // Conflict at the end
placed = SwedishGenerator.placeWord(grid, s, w1, undoBuffer, 0);
placed = SwedishGenerator.placeWord(grid, s, w1, undoBuffer, 3);
assertEquals(-1, placed);
// Verify grid is still empty (except for 'X')
assertEquals(SwedishGenerator.C_DASH, grid.getCharAt(0, 0));
@@ -305,14 +306,15 @@ public class SwedishGeneratorTest {
var packedPos = ((long) Grid.offset(0, 1)) | (((long) Grid.offset(0, 2)) << 7);
var s = Slot.from((0 << 8) | (1 << 4) | 2, packedPos, 2);
var w = new Lemma("AZ", 1, "A to Z");
var undoBuffer = new long[10];
var undoBuffer = new int[10];
var placed = SwedishGenerator.placeWord(grid, s, w, undoBuffer, 0);
assertEquals(2, placed);
assertEquals(1, placed);
assertEquals('A', grid.getCharAt(0, 1));
assertEquals('Z', grid.getCharAt(0, 2));
assertEquals(0b11L, undoBuffer[0]);
SwedishGenerator.undoPlace(grid, undoBuffer, 0, placed);
SwedishGenerator.undoPlace(grid, s, undoBuffer[0]);
assertEquals(SwedishGenerator.C_DASH, grid.getCharAt(0, 1));
assertEquals(SwedishGenerator.C_DASH, grid.getCharAt(0, 2));
}