Code cleanup

kris701 · Apr 9, 2024 · 5b95f81 · 5b95f81
1 parent 4f1c44d
commit 5b95f81
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 92 deletions.
diff --git a/SudokuSolver.Tests/BaseTests.cs b/SudokuSolver.Tests/BaseTests.cs
@@ -1,6 +1,4 @@
-using SudokuSolver.Tests.Models;
-
-[assembly: Parallelize(Workers = 12, Scope = ExecutionScope.MethodLevel)]
+[assembly: Parallelize(Workers = 12, Scope = ExecutionScope.MethodLevel)]
 
 namespace SudokuSolver.Tests
 {

diff --git a/SudokuSolver.Tests/Solvers/BacktrackSolvers/Pruners/CertainsPrunerTests.cs b/SudokuSolver.Tests/Solvers/BacktrackSolvers/Pruners/CertainsPrunerTests.cs
@@ -1,12 +1,6 @@
 using SudokuSolver.Models;
 using SudokuSolver.Solvers.BacktrackSolvers.Pruners;
-using SudokuSolver.Solvers.BacktrackSolvers.Reducers;
 using SudokuSolver.Solvers.Preprocessors;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Tests.Solvers.BacktrackSolvers.Pruners
 {

diff --git a/SudokuSolver.Tests/Solvers/BacktrackSolvers/Pruners/HiddenPairPrunerTests.cs b/SudokuSolver.Tests/Solvers/BacktrackSolvers/Pruners/HiddenPairPrunerTests.cs
@@ -1,12 +1,6 @@
 using SudokuSolver.Models;
 using SudokuSolver.Solvers.BacktrackSolvers.Pruners;
-using SudokuSolver.Solvers.BacktrackSolvers.Reducers;
 using SudokuSolver.Solvers.Preprocessors;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Tests.Solvers.BacktrackSolvers.Pruners
 {
@@ -27,7 +21,7 @@ public void Can_PruneCorrectly(string board, int expectedChange)
             var preCount = context.Cardinalities.Sum(x => x.Possibilities);
 
             // ACT
-            while (pruner1.Prune(context)) {}
+            while (pruner1.Prune(context)) { }
             context.Cardinalities = Preprocessor.GenerateCardinalities(context.Board, context.Candidates);
 
             // ASSERT

diff --git a/SudokuSolver.Tests/Solvers/BacktrackSolvers/Pruners/NakedPairPrunerTests.cs b/SudokuSolver.Tests/Solvers/BacktrackSolvers/Pruners/NakedPairPrunerTests.cs
@@ -1,12 +1,6 @@
 using SudokuSolver.Models;
 using SudokuSolver.Solvers.BacktrackSolvers.Pruners;
-using SudokuSolver.Solvers.BacktrackSolvers.Reducers;
 using SudokuSolver.Solvers.Preprocessors;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Tests.Solvers.BacktrackSolvers.Pruners
 {

diff --git a/SudokuSolver.Tests/Solvers/BacktrackSolvers/Pruners/NakedTripplePrunerTests.cs b/SudokuSolver.Tests/Solvers/BacktrackSolvers/Pruners/NakedTripplePrunerTests.cs
@@ -1,12 +1,6 @@
 using SudokuSolver.Models;
 using SudokuSolver.Solvers.BacktrackSolvers.Pruners;
-using SudokuSolver.Solvers.BacktrackSolvers.Reducers;
 using SudokuSolver.Solvers.Preprocessors;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Tests.Solvers.BacktrackSolvers.Pruners
 {

diff --git a/SudokuSolver/Models/SearchContext.cs b/SudokuSolver/Models/SearchContext.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SudokuSolver.Models
+namespace SudokuSolver.Models
 {
     public class SearchContext
     {

diff --git a/SudokuSolver/Solvers/BacktrackSolvers/BacktrackSolver.cs b/SudokuSolver/Solvers/BacktrackSolvers/BacktrackSolver.cs
@@ -1,6 +1,5 @@
 using SudokuSolver.Models;
 using SudokuSolver.Solvers.BacktrackSolvers.Pruners;
-using SudokuSolver.Solvers.BacktrackSolvers.Reducers;
 using SudokuSolver.Solvers.Preprocessors;
 
 namespace SudokuSolver.Solvers.BacktrackSolvers
@@ -16,16 +15,9 @@ public class BacktrackSolver : BaseSolver
             new PointingPairsPruner()
         };
 
-        public override SudokuBoard? Run(SearchContext context) 
+        public override SudokuBoard? Run(SearchContext context)
         {
-            bool any = true;
-            while (any)
-            {
-                any = false;
-                foreach (var pruner in Pruners)
-                    if (pruner.Prune(context))
-                        any = true;
-            }
+            Prune(context);
             context.Cardinalities = Preprocessor.GenerateCardinalities(context.Board, context.Candidates);
             if (context.Cardinalities.Count == 0)
             {
@@ -38,6 +30,23 @@ public class BacktrackSolver : BaseSolver
             return BacktrackSolve(context);
         }
 
+        private void Prune(SearchContext context)
+        {
+            bool any = true;
+            while (any)
+            {
+                any = false;
+                foreach (var pruner in Pruners)
+                {
+                    if (pruner.Prune(context))
+                    {
+                        any = true;
+                        break;
+                    }
+                }
+            }
+        }
+
         private SudokuBoard? BacktrackSolve(SearchContext context, int bestOffset = 0)
         {
             if (_stop)

diff --git a/SudokuSolver/Solvers/BacktrackSolvers/Pruners/BasePruner.cs b/SudokuSolver/Solvers/BacktrackSolvers/Pruners/BasePruner.cs
@@ -1,10 +1,4 @@
 using SudokuSolver.Models;
-using SudokuSolver.Solvers.BacktrackSolvers.Reducers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Solvers.BacktrackSolvers.Pruners
 {

diff --git a/SudokuSolver/Solvers/BacktrackSolvers/Pruners/CertainsPruner.cs b/SudokuSolver/Solvers/BacktrackSolvers/Pruners/CertainsPruner.cs
@@ -1,10 +1,4 @@
 using SudokuSolver.Models;
-using SudokuSolver.Solvers.BacktrackSolvers.Reducers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Solvers.BacktrackSolvers.Pruners
 {

diff --git a/SudokuSolver/Solvers/BacktrackSolvers/Pruners/HiddenPairPruner.cs b/SudokuSolver/Solvers/BacktrackSolvers/Pruners/HiddenPairPruner.cs
@@ -1,10 +1,4 @@
 using SudokuSolver.Models;
-using SudokuSolver.Solvers.BacktrackSolvers.Reducers;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Solvers.BacktrackSolvers.Pruners
 {

diff --git a/SudokuSolver/Solvers/BacktrackSolvers/Pruners/IPruner.cs b/SudokuSolver/Solvers/BacktrackSolvers/Pruners/IPruner.cs
@@ -1,11 +1,6 @@
 using SudokuSolver.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace SudokuSolver.Solvers.BacktrackSolvers.Reducers
+namespace SudokuSolver.Solvers.BacktrackSolvers.Pruners
 {
     public interface IPruner
     {

diff --git a/SudokuSolver/Solvers/BacktrackSolvers/Pruners/NakedPairPruner.cs b/SudokuSolver/Solvers/BacktrackSolvers/Pruners/NakedPairPruner.cs
@@ -1,9 +1,4 @@
 using SudokuSolver.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Solvers.BacktrackSolvers.Pruners
 {
@@ -66,7 +61,7 @@ private bool PruneNakedPairs(SearchContext context)
             }
 
             // Prune from blocks
-            for(int blockX = 0; blockX < SudokuBoard.Blocks; blockX++)
+            for (int blockX = 0; blockX < SudokuBoard.Blocks; blockX++)
             {
                 for (int blockY = 0; blockY < SudokuBoard.Blocks; blockY++)
                 {

diff --git a/SudokuSolver/Solvers/BacktrackSolvers/Pruners/NakedTripplePruner.cs b/SudokuSolver/Solvers/BacktrackSolvers/Pruners/NakedTripplePruner.cs
@@ -1,10 +1,4 @@
 using SudokuSolver.Models;
-using System;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Solvers.BacktrackSolvers.Pruners
 {

diff --git a/SudokuSolver/Solvers/BacktrackSolvers/Pruners/PointingPairsPruner.cs b/SudokuSolver/Solvers/BacktrackSolvers/Pruners/PointingPairsPruner.cs
@@ -1,9 +1,4 @@
 using SudokuSolver.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Solvers.BacktrackSolvers.Pruners
 {
@@ -30,7 +25,7 @@ private bool PrunePointingPairs(SearchContext context)
                     {
                         var valueAssignments = cellPossibilities.Where(x => x.Value == i).ToList();
                         if (IsRowAlligned(valueAssignments))
-                            pruned += PruneValueCandidatesFromColumn(context, valueAssignments, i); 
+                            pruned += PruneValueCandidatesFromColumn(context, valueAssignments, i);
                         else if (IsColumnAlligned(valueAssignments))
                             pruned += PruneValueCandidatesFromRow(context, valueAssignments, i);
                     }

diff --git a/...lver/Solvers/Preprocessor/Preprocessor.cs → ...ver/Solvers/Preprocessors/Preprocessor.cs b/...lver/Solvers/Preprocessor/Preprocessor.cs → ...ver/Solvers/Preprocessors/Preprocessor.cs
@@ -1,9 +1,4 @@
 using SudokuSolver.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace SudokuSolver.Solvers.Preprocessors
 {