From 29aceb2180272b023e4736b5c67c45afb74ef4fa Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 14 Jan 2026 14:17:01 +0100 Subject: [PATCH] introduce bitloops --- src/main/java/puzzle/Main.java | 4 ++-- src/main/java/puzzle/SwedishGenerator.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/puzzle/Main.java b/src/main/java/puzzle/Main.java index 4e73e35..081c12b 100644 --- a/src/main/java/puzzle/Main.java +++ b/src/main/java/puzzle/Main.java @@ -44,8 +44,8 @@ public class Main { public static class Opts { public int seed = (int) (System.nanoTime() ^ System.currentTimeMillis()); - public int pop = 18; - public int gens = 1200; + public int pop = 24; + public int gens = 700; public String wordsPath = "nl_score_hints_v3.csv"; public double minSimplicity = 0; // 0 means no limit public int threads = Math.max(1, Runtime.getRuntime().availableProcessors()); diff --git a/src/main/java/puzzle/SwedishGenerator.java b/src/main/java/puzzle/SwedishGenerator.java index 656e4fd..49f86a8 100644 --- a/src/main/java/puzzle/SwedishGenerator.java +++ b/src/main/java/puzzle/SwedishGenerator.java @@ -59,7 +59,7 @@ public record SwedishGenerator(Rng rng, int[] stack, Clues cache) { static final double SIZED = (double) SIZE;// ~18 static final long MASK_LO = (SIZE >= 64) ? -1L : (1L << SIZE) - 1; static final long MASK_HI = (SIZE <= 64) ? 0L : (SIZE >= 128 ? -1L : (1L << (SIZE - 64)) - 1); - static final int TARGET_CLUES = SIZE >>> 2; + static final int TARGET_CLUES = 24; static final int MAX_WORD_LENGTH = C <= R ? C : R; static final int MAX_WORD_LENGTH_PLUS_ONE = MAX_WORD_LENGTH + 1; static final int MIN_LEN = Config.MIN_LEN;