Passed the board state into the solver methods so we can try to use it for shape-based solver methods.

Author: MeltyPlayer

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

@@ -1,18 +1,15 @@
-using fin.data;
-using fin.data.indexable;
-using fin.math;
+using fin.math;
 using fin.picross.moves;
 using fin.picross.solver.methods;
 using fin.picross.solver.methods.easy;
 using fin.picross.solver.methods.hard;
-using fin.util.asserts;
 
 namespace fin.picross.solver;
 
 public class PicrossSolver {
   public IReadOnlyList<IReadOnlySet<IPicrossMove>> Solve(
       IPicrossDefinition picrossDefinition,
-      out PicrossBoardState finalBoardState) {
+      out IPicrossBoardState finalBoardState) {
     var boardState = new PicrossBoardState(picrossDefinition);
 
     var width = picrossDefinition.Width;
@@ -34,6 +31,7 @@ public IReadOnlyList<IReadOnlySet<IPicrossMove>> Solve(
       for (var x = 0; x < width; ++x) {
         foreach (var picrossMove1d in CheckClues_(
                      isFirstPass,
+                     boardState,
                      columnLineStates[x],
                      yClueIndicesForward,
                      yClueIndicesBackward)) {
@@ -54,6 +52,7 @@ public IReadOnlyList<IReadOnlySet<IPicrossMove>> Solve(
       for (var y = 0; y < height; ++y) {
         foreach (var picrossMove1d in CheckClues_(
                      isFirstPass,
+                     boardState,
                      rowLineStates[y],
                      xClueIndicesForward,
                      xClueIndicesBackward)) {
@@ -120,6 +119,7 @@ private static readonly IReadOnlyList<IPicrossSolverMethod> SOLVER_METHODS_
 
   private static IEnumerable<IPicrossMove1d> CheckClues_(
       bool isFirstPass,
+      IPicrossBoardState boardState,
       IPicrossLineState lineState,
       int[] clueIndicesForward,
       int[] clueIndicesBackward) {
@@ -217,7 +217,9 @@ var backwardMoves1d
 
     foreach (var solverMethod in SOLVER_METHODS_) {
       var hadAnyOfMethod = false;
-      foreach (var move in solverMethod.TryToFindMoves(lineState)) {
+      foreach (var move in solverMethod.TryToFindMoves(
+                   boardState,
+                   lineState)) {
         hadAnyOfMethod = true;
         yield return move;
       }

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

@@ -37,9 +37,11 @@ public class PicrossCellState : IPicrossCellState {
 public interface IPicrossBoardState : IReadOnlyGrid<IReadOnlyPicrossCellState> {
   IReadOnlyList<IPicrossLineState> ColumnLineStates { get; }
   IReadOnlyList<IPicrossLineState> RowLineStates { get; }
+
+  PicrossCompletionState GetCompletionState();
 }
 
-public class PicrossBoardState : IReadOnlyGrid<IReadOnlyPicrossCellState> {
+public class PicrossBoardState : IPicrossBoardState {
   private readonly IPicrossDefinition definition_;
   private readonly IReadOnlyList<IPicrossCellState> cellStates_;
 
@@ -102,6 +104,7 @@ private static IReadOnlyList<IReadOnlyList<IPicrossClueState>> ToClueStates_(
 
   public IReadOnlyList<IPicrossLineState> ColumnLineStates
     => this.columnLineStates_;
+
   public IReadOnlyList<IPicrossLineState> RowLineStates => this.rowLineStates_;
 
   public void ApplyMoves(IReadOnlySet<IPicrossMove> moveSet) {

FinModelUtility/Fin/Fin.Picross/src/solver/methods/BBidirectionalSolverMethod.cs

@@ -4,6 +4,7 @@ namespace fin.picross.solver.methods;
 
 public abstract class BBidirectionalSolverMethod : IPicrossSolverMethod {
   public abstract IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState boardState,
       IPicrossLineState lineState,
       int iStart,
       int iEnd,
@@ -12,19 +13,22 @@ public abstract IEnumerable<IPicrossMove1d> TryToFindMoves(
       int increment);
 
   public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState boardState,
       IPicrossLineState lineState) {
     var clues = lineState.ClueStates;
     var cellStates = lineState.CellStates;
 
     var forwardMoves
-        = this.TryToFindMoves(lineState,
+        = this.TryToFindMoves(boardState,
+                              lineState,
                               0,
                               cellStates.Count,
                               0,
                               clues.Count,
                               1);
     var backwardMoves
-        = this.TryToFindMoves(lineState,
+        = this.TryToFindMoves(boardState,
+                              lineState,
                               cellStates.Count - 1,
                               -1,
                               clues.Count - 1,

FinModelUtility/Fin/Fin.Picross/src/solver/methods/BigThenSinglesSolverMethod.cs

@@ -5,6 +5,7 @@ namespace fin.picross.solver.methods;
 
 public class BigThenSinglesSolverMethod : BBidirectionalSolverMethod {
   public override IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState,
       int iStart,
       int iEnd,

FinModelUtility/Fin/Fin.Picross/src/solver/methods/ExpandFinalUnsolvedClueSolverMethod.cs

@@ -4,8 +4,9 @@
 namespace fin.picross.solver.methods;
 
 public class ExpandFinalUnsolvedClueSolverMethod : IPicrossSolverMethod {
-  public IEnumerable<IPicrossMove1d>
-      TryToFindMoves(IPicrossLineState lineState) {
+  public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
+      IPicrossLineState lineState) {
     // Make sure we only run this solver if there's a single unsolved clue
     var clueStates = lineState.ClueStates;
     var lastUnsolvedClue

FinModelUtility/Fin/Fin.Picross/src/solver/methods/ExpandFirstClueWhenPerfectFitSolverMethod.cs

@@ -5,6 +5,7 @@ namespace fin.picross.solver.methods;
 public class ExpandFirstClueWhenPerfectFitSolverMethod
     : BBidirectionalSolverMethod {
   public override IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState,
       int iStart,
       int iEnd,

FinModelUtility/Fin/Fin.Picross/src/solver/methods/ExpandTwoSeparatedCluesSolverMethod.cs

@@ -3,8 +3,9 @@
 namespace fin.picross.solver.methods;
 
 public class ExpandTwoSeparatedCluesSolverMethod : IPicrossSolverMethod {
-  public IEnumerable<IPicrossMove1d>
-      TryToFindMoves(IPicrossLineState lineState) {
+  public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
+      IPicrossLineState lineState) {
     var clueStates = lineState.ClueStates;
     if (clueStates is not [
             { Solved: false } firstClue,

FinModelUtility/Fin/Fin.Picross/src/solver/methods/ExtendFirstClueSolverMethod.cs

@@ -4,6 +4,7 @@ namespace fin.picross.solver.methods;
 
 public class ExtendFirstClueSolverMethod : BBidirectionalSolverMethod {
   public override IEnumerable<PicrossCellMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState,
       int iStart,
       int iEnd,

FinModelUtility/Fin/Fin.Picross/src/solver/methods/FillSmallestUnknownsBetweenEmptiesSolverMethod.cs

@@ -5,6 +5,7 @@ namespace fin.picross.solver.methods;
 public class FillSmallestUnknownsBetweenEmptiesSolverMethod
     : IPicrossSolverMethod {
   public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState) {
     var clues = lineState.ClueStates;
     var cellStates = lineState.CellStates;

FinModelUtility/Fin/Fin.Picross/src/solver/methods/GapsAroundFirstClueSolverMethod.cs

@@ -4,6 +4,7 @@ namespace fin.picross.solver.methods;
 
 public class GapsAroundFirstClueSolverMethod : BBidirectionalSolverMethod {
   public override IEnumerable<PicrossCellMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState,
       int iStart,
       int iEnd,

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

@@ -3,8 +3,9 @@
 namespace fin.picross.solver.methods;
 
 public class GapsBetweenKnownCluesSolverMethod : IPicrossSolverMethod {
-  public IEnumerable<IPicrossMove1d>
-      TryToFindMoves(IPicrossLineState lineState) {
+  public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
+      IPicrossLineState lineState) {
     var clueStates = lineState.ClueStates;
     var cellStates = lineState.CellStates;
     var length = cellStates.Count;

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

@@ -4,6 +4,7 @@ namespace fin.picross.solver.methods;
 
 public class GapsBetweenNeighboringCluesSolverMethod : IPicrossSolverMethod {
   public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState) {
     var clues = lineState.ClueStates;
     var cellStates = lineState.CellStates;

FinModelUtility/Fin/Fin.Picross/src/solver/methods/GapsBetweenNeighboringShortCluesSolverMethod.cs

@@ -5,6 +5,7 @@ namespace fin.picross.solver.methods;
 public class GapsBetweenNeighboringShortCluesSolverMethod
     : IPicrossSolverMethod {
   public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState) {
     var clues = lineState.ClueStates;
     var cellStates = lineState.CellStates;

FinModelUtility/Fin/Fin.Picross/src/solver/methods/Interfaces.cs

@@ -3,5 +3,7 @@
 namespace fin.picross.solver.methods;
 
 public interface IPicrossSolverMethod {
-  IEnumerable<IPicrossMove1d> TryToFindMoves(IPicrossLineState lineState);
+  IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState boardState,
+      IPicrossLineState lineState);
 }

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

@@ -5,6 +5,7 @@ namespace fin.picross.solver.methods;
 
 public class MatchingBiggestOrUniqueLengthSolverMethod : IPicrossSolverMethod {
   public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState) {
     var clueStates = lineState.ClueStates;
     var cellStates = lineState.CellStates;

FinModelUtility/Fin/Fin.Picross/src/solver/methods/OnlyClueLengthInReachSolverMethod.cs

@@ -5,6 +5,7 @@ namespace fin.picross.solver.methods;
 
 public class OnlyClueLengthInReachSolverMethod : BBidirectionalSolverMethod {
   public override IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState,
       int iStart,
       int iEnd,

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

@@ -4,6 +4,7 @@ namespace fin.picross.solver.methods.easy;
 
 public class AlreadySolvedPicrossSolverMethod : IPicrossSolverMethod {
   public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState) {
     var clueStates = lineState.ClueStates;
     var cellStates = lineState.CellStates;

FinModelUtility/Fin/Fin.Picross/src/solver/methods/easy/AlreadySolvedUpToPicrossSolverMethod.cs

@@ -4,6 +4,7 @@ namespace fin.picross.solver.methods.easy;
 
 public class AlreadySolvedUpToPicrossSolverMethod : BBidirectionalSolverMethod {
   public override IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState,
       int iStart,
       int iEnd,

FinModelUtility/Fin/Fin.Picross/src/solver/methods/easy/GapsAroundKnownCluesSolverMethod.cs

@@ -4,6 +4,7 @@ namespace fin.picross.solver.methods.easy;
 
 public class GapsAroundKnownCluesSolverMethod : IPicrossSolverMethod {
   public IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState) {
     var clueStates = lineState.ClueStates;
     var cellStates = lineState.CellStates;

FinModelUtility/Fin/Fin.Picross/src/solver/methods/hard/SingleNextToEdgeSolverMethod.cs

@@ -4,6 +4,7 @@ namespace fin.picross.solver.methods.hard;
 
 public class SingleNextToEdgeSolverMethod : BBidirectionalSolverMethod {
   public override IEnumerable<IPicrossMove1d> TryToFindMoves(
+      IPicrossBoardState _,
       IPicrossLineState lineState,
       int iStart,
       int iEnd,