Added a solver method for automatically filling in gaps between known clues.

Author: MeltyPlayer

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

@@ -126,6 +126,7 @@ private static readonly IReadOnlyList<IPicrossSolverMethod> SOLVER_METHODS_
           new FillSmallestUnknownsBetweenEmptiesSolverMethod(),
           new GapsAroundFirstClueSolverMethod(),
           new GapsAroundKnownCluesSolverMethod(),
+          new GapsBetweenKnownCluesSolverMethod(),
           new GapsBetweenNeighboringCluesSolverMethod(),
           new GapsBetweenNeighboringShortCluesSolverMethod(),
           new MatchingBiggestOrUniqueLengthSolverMethod(),

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

@@ -0,0 +1,57 @@
+using fin.picross.moves;
+
+namespace fin.picross.solver;
+
+public class GapsBetweenKnownCluesSolverMethod : IPicrossSolverMethod {
+  public IEnumerable<IPicrossMove1d>
+      TryToFindMoves(IPicrossLineState lineState) {
+    var clueStates = lineState.ClueStates;
+    var cellStates = lineState.CellStates;
+    var length = cellStates.Count;
+
+    var firstClueState = clueStates[0];
+    if (firstClueState.Solved) {
+      for (var i = 0; i < firstClueState.StartIndex; ++i) {
+        if (cellStates[i].Status == PicrossCellStatus.UNKNOWN) {
+          yield return new PicrossCellMove1d(
+              PicrossCellMoveType.MARK_EMPTY,
+              PicrossCellMoveSource.EMPTY_BETWEEN_CLUES,
+              i);
+        }
+      }
+    }
+
+    for (var clueI = 0; clueI < clueStates.Count - 1; ++clueI) {
+      var currentClueState = clueStates[clueI];
+      var nextClueState = clueStates[clueI + 1];
+
+      if (currentClueState.Solved && nextClueState.Solved) {
+        for (var i = currentClueState.StartIndex.Value +
+                     currentClueState.Length;
+             i < nextClueState.StartIndex;
+             ++i) {
+          if (cellStates[i].Status == PicrossCellStatus.UNKNOWN) {
+            yield return new PicrossCellMove1d(
+                PicrossCellMoveType.MARK_EMPTY,
+                PicrossCellMoveSource.EMPTY_BETWEEN_CLUES,
+                i);
+          }
+        }
+      }
+    }
+
+    var lastClueState = clueStates[^1];
+    if (lastClueState.Solved) {
+      for (var i = lastClueState.StartIndex.Value + lastClueState.Length;
+           i < length;
+           ++i) {
+        if (cellStates[i].Status == PicrossCellStatus.UNKNOWN) {
+          yield return new PicrossCellMove1d(
+              PicrossCellMoveType.MARK_EMPTY,
+              PicrossCellMoveSource.EMPTY_BETWEEN_CLUES,
+              i);
+        }
+      }
+    }
+  }
+}

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

@@ -22,13 +22,15 @@ public enum PicrossCompletionState {
 public partial interface IPicrossCellState {
   PicrossCellStatus Status { get; set; }
   PicrossCellMoveSource MoveSource { get; set; }
-  IPicrossClue? Clue { get; set; }
+  IPicrossClue? ColumnClue { get; set; }
+  IPicrossClue? RowClue { get; set; }
 }
 
 public class PicrossCellState : IPicrossCellState {
   public PicrossCellStatus Status { get; set; }
   public PicrossCellMoveSource MoveSource { get; set; }
-  public IPicrossClue? Clue { get; set; }
+  public IPicrossClue? ColumnClue { get; set; }
+  public IPicrossClue? RowClue { get; set; }
 }
 
 public class PicrossBoardState : IReadOnlyGrid<IReadOnlyPicrossCellState> {
@@ -84,16 +86,15 @@ public void ApplyMoves(IReadOnlySet<IPicrossMove> moveSet) {
         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;
+              var x = clue.ColumnOrRowIndex;
+              var y = i;
+              this.cellStates_[y * width + x].ColumnClue = clue;
             } else {
-              x = i;
-              y = clue.ColumnOrRowIndex;
+              var x = i;
+              var y = clue.ColumnOrRowIndex;
+              this.cellStates_[y * width + x].RowClue = clue;
             }
-
-            this.cellStates_[y * width + x].Clue = clue;
           }
 
           break;