human solver: Minor speed optimizations

meikpiep · Jan 3, 2025 · af6a0cb · af6a0cb
1 parent 122d3eb
commit af6a0cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/difficulty/human/GridLines.kt b/gauguin-core/src/main/kotlin/org/piepmeyer/gauguin/difficulty/human/GridLines.kt
@@ -24,7 +24,7 @@ class GridLines(
     ): List<Int> {
         val cellIndexesInLines =
             cage.cells.mapIndexedNotNull { index, cell ->
-                if (any { line -> line.contains(cell) }) {
+                if (cell in cells) {
                     index
                 } else {
                     null

diff --git a/...e/src/main/kotlin/org/piepmeyer/gauguin/difficulty/human/strategy/SinglePossibleInCage.kt b/...e/src/main/kotlin/org/piepmeyer/gauguin/difficulty/human/strategy/SinglePossibleInCage.kt
@@ -16,12 +16,12 @@ class SinglePossibleInCage : HumanSolverStrategy {
 
                 for (cellNumber in 0..<cage.cells.size) {
                     if (!cage.getCell(cellNumber).isUserValueSet) {
-                        val differentPossibles = validPossibles.map { it[cellNumber] }.distinct()
+                        val possibles = validPossibles.map { it[cellNumber] }
 
-                        if (differentPossibles.size == 1) {
+                        if (possibles.isNotEmpty() && (possibles.size == 1 || possibles.none { it != possibles.first() })) {
                             grid.setUserValueAndRemovePossibles(
                                 cage.getCell(cellNumber),
-                                differentPossibles.single(),
+                                possibles.first(),
                             )
 
                             return true