Whoops, now I'm properly factoring in clues in the solver.

Author: MeltyPlayer

FinModelUtility/Fin/Fin.Picross/src/PicrossCluesGenerator.cs

@@ -54,7 +54,11 @@ private static IPicrossClue[] GetClues_(ref int index,
         ++length;
       } else if (length > 0) {
         clues.AddLast(
-            new PicrossClue(index++, isForColumn, columnOrRowIndex, (byte) (i - length), length));
+            new PicrossClue(index++,
+                            isForColumn,
+                            columnOrRowIndex,
+                            (byte) (i - length),
+                            length));
         length = 0;
       }
 
@@ -63,7 +67,11 @@ private static IPicrossClue[] GetClues_(ref int index,
 
     if (clues.Count == 0 || length != 0) {
       clues.AddLast(
-          new PicrossClue(index++, isForColumn, columnOrRowIndex, (byte) (i - length), length));
+          new PicrossClue(index++,
+                          isForColumn,
+                          columnOrRowIndex,
+                          length == 0 ? (byte) 0 : (byte) (i - length),
+                          length));
     }
 
     return clues.ToArray();

FinModelUtility/Fin/Fin.Picross/src/PicrossSolver.cs

@@ -2,6 +2,7 @@
 using fin.data.indexable;
 using fin.math;
 using fin.picross.moves;
+using fin.util.asserts;
 
 namespace fin.picross.solver;
 
@@ -59,6 +60,10 @@ var clueStatesByClue
               moveSet.Add(new PicrossCellMove(moveType, moveSource, x, y));
               break;
             }
+            case PicrossClueMove picrossClueMove: {
+              moveSet.Add(picrossClueMove);
+              break;
+            }
           }
         }
       }
@@ -75,6 +80,10 @@ var clueStatesByClue
               moveSet.Add(new PicrossCellMove(moveType, moveSource, x, y));
               break;
             }
+            case PicrossClueMove picrossClueMove: {
+              moveSet.Add(picrossClueMove);
+              break;
+            }
           }
         }
       }
@@ -85,6 +94,23 @@ var clueStatesByClue
       }
 
       boardState.ApplyMoves(moveSet);
+      foreach (var move in moveSet) {
+        if (move is PicrossClueMove clueMove) {
+          var clueState = clueStatesByClue[clueMove.Clue];
+
+          // Verifies clue is at the correct location.
+          Asserts.Equal(clueState.Clue.CorrectStartIndex,
+                        clueMove.StartIndex,
+                        $"Incorrect clue move of source {clueMove.MoveSource}; marked as starting at {clueMove.StartIndex} but should actually be {clueState.Clue.CorrectStartIndex}");
+
+          // Verifies we didn't already mark this clue as solved.
+          Asserts.False(clueState.Solved,
+                        $"Got duplicate clue solution of source {clueMove.MoveSource}");
+
+          clueState.StartIndex = clueMove.StartIndex;
+        }
+      }
+
       moveSets.Add(moveSet);
     }
 
@@ -355,11 +381,12 @@ var targetI
         }
       }
 
-      if (isFirstClue && clueUnknownCount == 0) {
+      if (isFirstClue && clueUnknownCount == 0 && !clueState.Solved) {
+        var clueStartI = forward ? i : i + increment * (clueLength - 1);
         yield return new PicrossClueMove(
             PicrossClueMoveSource.FIRST_CLUE,
             clueState.Clue,
-            Math.Min(i, i + increment * clueLength));
+            clueStartI);
       }
 
       totalUnknownCount += clueUnknownCount;

FinModelUtility/Fin/Fin.Picross/src/solver/AlreadySolvedPicrossSolverMethod.cs

@@ -20,13 +20,7 @@ var actualCount
     }
 
     if (alreadySolved) {
-      if (clueStates is [{ Length: 0 }]) {
-        yield return new PicrossClueMove(
-            PicrossClueMoveSource.ALL_CLUES_SOLVED,
-            clueStates[0].Clue,
-            0
-        );
-      } else {
+      if (clueStates is not [{ Length: 0 }]) {
         var cellI = 0;
         foreach (var clueState in clueStates) {
           while (cellStates[cellI].Status != PicrossCellStatus.KNOWN_FILLED) {

FinModelUtility/Fin/Fin.Picross/src/solver/GapsBetweenNeighboringCluesSolverMethod.cs

@@ -9,7 +9,11 @@ public IEnumerable<IPicrossMove1d> TryToFindMoves(
     var cellStates = lineState.CellStates;
     var length = cellStates.Count;
 
-    var biggestLength = clues.Max(c => c.Length);
+    if (clues.All(c => c.Solved)) {
+      yield break;
+    }
+
+    var biggestLength = clues.Where(c => !c.Solved).Max(c => c.Length);
 
     var cell0 = cellStates[0].Status;
     var cell1 = cellStates[1].Status;

FinModelUtility/Fin/Fin.Picross/src/solver/MatchingBiggestOrUniqueLengthSolverMethod.cs

@@ -10,7 +10,12 @@ public IEnumerable<IPicrossMove1d> TryToFindMoves(
     var cellStates = lineState.CellStates;
     var length = cellStates.Count;
 
-    var biggestUnusedLength = clueStates.Where(c => !c.Solved).Max(c => c.Length);
+    if (clueStates.All(c => c.Solved)) {
+      yield break;
+    }
+
+    var biggestUnusedLength
+        = clueStates.Where(c => !c.Solved).Max(c => c.Length);
 
     int startIndex = -1;
     var inClue = false;
@@ -67,6 +72,10 @@ private static IEnumerable<IPicrossMove1d> CheckIfMatchingClue_(
       int clueLength,
       bool knownEmptyBefore,
       bool knownEmptyAfter) {
+    if (clueStates.Any(c => c.StartIndex == startI)) {
+      yield break;
+    }
+
     var firstClueWithExactLength
         = clueStates.Where(c => !c.Solved)
                     .FirstOrDefaultAndCount(c => c.Length == clueLength,
@@ -79,6 +88,11 @@ var firstClueWithExactLength
 
     if (matchingClueCount == 1 &&
         (isBiggest || (knownEmptyBefore && knownEmptyAfter))) {
+      if (clueStates is [{ Length: 2 }, { Length: 2 }, { Length: 1 }] &&
+          startI == 2) {
+        ;
+      }
+
       yield return new PicrossClueMove(
           PicrossClueMoveSource.ONLY_MATCHING_CLUE,
           firstClueWithExactLength.Clue,

FinModelUtility/Fin/Fin.Picross/src/solver/PicrossBoardState.cs

@@ -21,11 +21,14 @@ public enum PicrossCompletionState {
 [GenerateReadOnly]
 public partial interface IPicrossCellState {
   PicrossCellStatus Status { get; set; }
+  PicrossCellMoveSource MoveSource { get; set; }
+  IPicrossClue? Clue { get; set; }
 }
 
 public class PicrossCellState : IPicrossCellState {
   public PicrossCellStatus Status { get; set; }
   public PicrossCellMoveSource MoveSource { get; set; }
+  public IPicrossClue? Clue { get; set; }
 }
 
 public class PicrossBoardState : IReadOnlyGrid<IReadOnlyPicrossCellState> {
@@ -57,23 +60,41 @@ public void ApplyMoves(IReadOnlySet<IPicrossMove> moveSet) {
 
           var cellState = this.cellStates_[y * width + x];
 
-          // Verifies the board didn't already have a move at this location.
-          Asserts.Equal(PicrossCellStatus.UNKNOWN,
-                        cellState.Status,
-                        $"Got a duplicate move of source {moveSource}");
-
           // Verifies moves are correct against the existing board.
           var expected = moveType == PicrossCellMoveType.MARK_FILLED;
           Asserts.Equal(expected,
                         this.definition_[x, y],
                         $"Incorrect move of source {moveSource}.");
 
+          // Verifies the board didn't already have a move at this location.
+          Asserts.Equal(PicrossCellStatus.UNKNOWN,
+                        cellState.Status,
+                        $"Got a duplicate move of source {moveSource}");
+
           // Applies the move to the cell.
           cellState.Status = moveType switch {
-              PicrossCellMoveType.MARK_EMPTY  => PicrossCellStatus.KNOWN_EMPTY,
+              PicrossCellMoveType.MARK_EMPTY => PicrossCellStatus.KNOWN_EMPTY,
               PicrossCellMoveType.MARK_FILLED => PicrossCellStatus.KNOWN_FILLED,
-              _                           => throw new ArgumentOutOfRangeException()
+              _ => throw new ArgumentOutOfRangeException()
           };
+          cellState.MoveSource = moveSource;
+
+          break;
+        }
+        case PicrossClueMove picrossClueMove: {
+          var (_, clue, startI) = picrossClueMove;
+          for (var i = startI; i < startI + clue.Length; ++i) {
+            int x, y;
+            if (clue.IsForColumn) {
+              x = clue.ColumnOrRowIndex;
+              y = i;
+            } else {
+              x = i;
+              y = clue.ColumnOrRowIndex;
+            }
+
+            this.cellStates_[y * width + x].Clue = clue;
+          }
 
           break;
         }