From df981d86013e2733008666c84d4936e8bc240ad0 Mon Sep 17 00:00:00 2001
From: mike <michael@appmodel.nl>
Date: Fri, 9 Jan 2026 02:49:12 +0100
Subject: [PATCH] Gather data

---
 src/test/java/puzzle/MainTest.java            |  2 +-
 .../java/puzzle/SwedishGeneratorTest.java     | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/test/java/puzzle/MainTest.java b/src/test/java/puzzle/MainTest.java
index fd0ca87..ca1d4c9 100644
--- a/src/test/java/puzzle/MainTest.java
+++ b/src/test/java/puzzle/MainTest.java
@@ -90,7 +90,7 @@ public class MainTest {
       // Initialize with #
       for (int r = 0; r < 3; r++) {
          for (int c = 0; c < 4; c++) {
-            grid.setCharAt(r, c, C_DASH);
+            grid.clear(r, c);
          }
       }
       
diff --git a/src/test/java/puzzle/SwedishGeneratorTest.java b/src/test/java/puzzle/SwedishGeneratorTest.java
index 3304875..57b2394 100644
--- a/src/test/java/puzzle/SwedishGeneratorTest.java
+++ b/src/test/java/puzzle/SwedishGeneratorTest.java
@@ -21,7 +21,7 @@ public class SwedishGeneratorTest {
    
    @Test
    void testPatternForSlotMixed() {
-      var grid    = new Grid(new byte[]{ 65, (byte) ('0' + 1), 67 }); // A - C
+      var grid    = new Grid(new byte[]{ 65, SwedishGenerator.DASH, 67 }); // A - C
       var slot    = Slot.from(0 << 8 | 1 << 4 | 2, ((long) 0) | ((long) 1 << 7) | ((long) 2 << 14), 3);
       var pattern = new byte[3];
       SwedishGenerator.patternForSlot(grid, slot, pattern);
@@ -31,7 +31,7 @@ public class SwedishGeneratorTest {
    
    @Test
    void testPatternForSlotAllDashes() {
-      var grid    = new Grid(new byte[]{ (byte) ('0' + 1), (byte) ('0' + 1), (byte) ('0' + 1) }); // - - -
+      var grid    = new Grid(new byte[]{ SwedishGenerator.DASH, SwedishGenerator.DASH, SwedishGenerator.DASH }); // - - -
       var slot    = Slot.from(0 << 8 | 1 << 4 | 2, ((long) 0) | ((long) 1 << 7) | ((long) 2 << 14), 3);
       var pattern = new byte[3];
       SwedishGenerator.patternForSlot(grid, slot, pattern);
@@ -41,7 +41,7 @@ public class SwedishGeneratorTest {
    
    @Test
    void testPatternForSlotSingleLetter() {
-      var grid    = new Grid(new byte[]{ 65, (byte) ('0' + 1), (byte) ('0' + 1) }); // A - -
+      var grid    = new Grid(new byte[]{ 65, SwedishGenerator.DASH, SwedishGenerator.DASH }); // A - -
       var slot    = Slot.from(0 << 8 | 1 << 4 | 2, ((long) 0) | ((long) 1 << 7) | ((long) 2 << 14), 3);
       var pattern = new byte[3];
       SwedishGenerator.patternForSlot(grid, slot, pattern);
@@ -103,10 +103,10 @@ public class SwedishGeneratorTest {
    @Test
    void testLemmaAndDict() {
       var l1 = new Lemma("APPLE", 5, "A fruit");
-      Assertions.assertArrayEquals("APPLE".getBytes(), l1.word());
+      Assertions.assertArrayEquals("APPLE".getBytes(java.nio.charset.StandardCharsets.US_ASCII), l1.word());
       assertEquals(5, l1.word().length);
       assertEquals(5, l1.simpel());
-      assertEquals('A', l1.byteAt(0));
+      assertEquals((byte) 'A', l1.byteAt(0));
       
       var l2   = new Lemma("AXE", 2, "A tool");
       var dict = new Dict(new Lemma[]{ l1, l2 });
@@ -116,11 +116,11 @@ public class SwedishGeneratorTest {
       
       var entry3 = dict.index()[3];
       assertEquals(1, entry3.words().size());
-      Assertions.assertArrayEquals("AXE".getBytes(), entry3.words().getFirst().word());
+      Assertions.assertArrayEquals("AXE".getBytes(java.nio.charset.StandardCharsets.US_ASCII), entry3.words().getFirst().word());
       
       // Check pos indexing
       // AXE: A at 0, X at 1, E at 2
-      assertTrue(entry3.pos()[0]['A' - 'A'].size() > 0);
+      assertTrue(entry3.pos()[0][0].size() > 0);
       assertTrue(entry3.pos()[1]['X' - 'A'].size() > 0);
       assertTrue(entry3.pos()[2]['E' - 'A'].size() > 0);
    }
@@ -291,8 +291,8 @@ public class SwedishGeneratorTest {
       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));
-      assertEquals(SwedishGenerator.C_DASH, grid.getCharAt(0, 1));
+      assertEquals(SwedishGenerator.DASH, grid.byteAt(0, 0));
+      assertEquals(SwedishGenerator.DASH, grid.byteAt(0, 1));
       assertEquals('X', grid.getCharAt(0, 2));
    }
    
@@ -312,7 +312,7 @@ public class SwedishGeneratorTest {
       assertEquals(0b11L, undoBuffer[0]);
       
       SwedishGenerator.undoPlace(grid, s, undoBuffer[0]);
-      assertEquals(SwedishGenerator.C_DASH, grid.getCharAt(0, 1));
-      assertEquals(SwedishGenerator.C_DASH, grid.getCharAt(0, 2));
+      assertEquals(SwedishGenerator.DASH, grid.byteAt(0, 1));
+      assertEquals(SwedishGenerator.DASH, grid.byteAt(0, 2));
    }
 }
\ No newline at end of file