Code cleanup, reduced duplication.

kurtanr · kurtanr · commit 27b47c7061dc · 2019-08-30T20:57:26.000+02:00
diff --git a/SimpleSudokuSolver.Tests/Strategy/HiddenPairTests.cs b/SimpleSudokuSolver.Tests/Strategy/HiddenPairTests.cs
@@ -11,7 +11,7 @@ public class HiddenPairTests : BaseStrategyTest
     [Test]
     public void HiddenPairTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 0,0,0,0,0,0,0,0,0 },
@@ -43,7 +43,7 @@ public void HiddenPairTest1()
     [Test]
     public void HiddenPairTest2()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 7,2,0,4,0,8,0,3,0 },
diff --git a/SimpleSudokuSolver.Tests/Strategy/HiddenQuadTests.cs b/SimpleSudokuSolver.Tests/Strategy/HiddenQuadTests.cs
@@ -11,7 +11,7 @@ public class HiddenQuadTests : BaseStrategyTest
     [Test]
     public void HiddenQuadTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 6,5,0,0,8,7,0,2,4 },
@@ -45,7 +45,7 @@ public void HiddenQuadTest1()
     [Test]
     public void HiddenQuadTest2()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 9,0,1,5,0,0,0,4,6 },
diff --git a/SimpleSudokuSolver.Tests/Strategy/HiddenSingleTests.cs b/SimpleSudokuSolver.Tests/Strategy/HiddenSingleTests.cs
@@ -11,30 +11,30 @@ public class HiddenSingleTests : BaseStrategyTest
     [Test]
     public void HiddenSingleTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
-        // From: http://www.sudokuwiki.org/Getting_Started
-        { 2,0,0,0,7,0,0,3,8 },
-        { 0,0,0,0,0,6,0,7,0 },
-        { 3,0,0,0,4,0,6,0,0 },
-        { 0,0,8,0,2,0,7,0,0 },
-        { 1,0,0,0,0,0,0,0,6 },
-        { 0,0,7,0,3,0,4,0,0 },
-        { 0,0,4,0,8,0,0,0,9 },
-        { 0,6,0,4,0,0,0,0,0 },
-        { 9,1,0,0,6,0,0,0,2 }
+        // From: http://manifestmaster.com/jetsudoku/hiddensingle.html
+        { 0,6,0,8,0,0,0,4,0 },
+        { 0,0,0,0,4,0,0,0,2 },
+        { 2,0,4,6,0,0,0,0,9 },
+        { 0,0,1,0,0,9,3,0,0 },
+        { 0,9,6,0,0,0,4,5,0 },
+        { 0,0,8,3,0,0,0,0,0 },
+        { 1,0,7,0,0,3,2,0,5 },
+        { 9,0,2,0,5,0,0,0,0 },
+        { 0,3,5,0,0,1,0,7,0 }
       };
 
       var sudokuPuzzle = new SudokuPuzzle(sudoku);
       SolveUsingStrategy(sudokuPuzzle, _strategy);
 
-      Assert.That(sudokuPuzzle.IsSolved());
+      Assert.That(sudokuPuzzle.Cells[4, 0].Value, Is.EqualTo(3));
     }
 
     [Test]
     public void HiddenSingleTest2()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: https://sudoku9x9.com/hidden_single.html
         { 0,0,0,0,0,0,0,0,0 },
diff --git a/SimpleSudokuSolver.Tests/Strategy/HiddenTripleTests.cs b/SimpleSudokuSolver.Tests/Strategy/HiddenTripleTests.cs
@@ -11,7 +11,7 @@ public class HiddenTripleTests : BaseStrategyTest
     [Test]
     public void HiddenTripleTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Hidden_Candidates
         { 0,0,0,0,0,1,0,3,0 },
diff --git a/SimpleSudokuSolver.Tests/Strategy/LockedCandidatesPointingTests.cs b/SimpleSudokuSolver.Tests/Strategy/LockedCandidatesPointingTests.cs
@@ -11,7 +11,7 @@ public class LockedCandidatesPointingTests : BaseStrategyTest
     [Test]
     public void LockedCandidatesPointingInColumnTest()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: https://sudoku9x9.com/locked_candidates.html
         { 0,1,2,0,0,0,0,0,0 },
@@ -40,7 +40,7 @@ public void LockedCandidatesPointingInColumnTest()
     public void LockedCandidatesPointingInRowTest()
     {
       // From: https://sudoku9x9.com/locked_candidates.html, transposed
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         { 0,0,0,0,0,0,0,0,0 },
         { 1,0,5,0,0,0,0,0,0 },
@@ -67,7 +67,7 @@ public void LockedCandidatesPointingInRowTest()
     [Test]
     public void LockedCandidatesPointingTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Intersection_Removal
         { 0,1,7,9,0,3,6,0,0 },
@@ -97,7 +97,7 @@ public void LockedCandidatesPointingTest1()
     [Test]
     public void LockedCandidatesPointingTest2()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Intersection_Removal
         { 0,3,2,0,0,6,1,0,0 },
@@ -151,7 +151,7 @@ public void LockedCandidatesPointingTest2()
     [Test]
     public void LockedCandidatesPointingTest3()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Intersection_Removal
         { 9,3,0,0,5,0,0,0,0 },
diff --git a/SimpleSudokuSolver.Tests/Strategy/NakedPairTests.cs b/SimpleSudokuSolver.Tests/Strategy/NakedPairTests.cs
@@ -12,7 +12,7 @@ public class NakedPairTests : BaseStrategyTest
     public void NakedPairInRowTest()
     {
       // From: https://sudoku9x9.com/naked_pair.html
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         { 9,0,0,4,0,0,1,0,0 },
         { 0,5,6,0,0,0,0,0,0 },
@@ -37,7 +37,7 @@ public void NakedPairInRowTest()
     public void NakedPairInColumnTest()
     {
       // From: https://sudoku9x9.com/naked_pair.html, transposed
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         { 9,0,0,0,0,0,0,0,0 },
         { 0,5,7,0,0,0,0,0,0 },
@@ -61,7 +61,7 @@ public void NakedPairInColumnTest()
     [Test]
     public void NakedPairTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Naked_Candidates
         { 4,0,0,0,0,0,9,3,8 },
@@ -92,7 +92,7 @@ public void NakedPairTest1()
     [Test]
     public void NakedPairTest2()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Naked_Candidates
         { 0,8,0,0,9,0,0,3,0 },
diff --git a/SimpleSudokuSolver.Tests/Strategy/NakedQuadTests.cs b/SimpleSudokuSolver.Tests/Strategy/NakedQuadTests.cs
@@ -11,7 +11,7 @@ public class NakedQuadTests : BaseStrategyTest
     [Test]
     public void NakedQuadTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Naked_Candidates
         // Contains one naked quad in block, and after that, one naked quad in row
@@ -41,7 +41,7 @@ public void NakedQuadTest1()
     [Test]
     public void NakedQuadTest2()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.manifestmaster.com/jetsudoku/nakedQuad.html
         // Naked quad in column - must first use LockedCandidatesPointing to eliminate some candidates
diff --git a/SimpleSudokuSolver.Tests/Strategy/NakedSingleTests.cs b/SimpleSudokuSolver.Tests/Strategy/NakedSingleTests.cs
@@ -11,7 +11,7 @@ public class NakedSingleTests : BaseStrategyTest
     [Test]
     public void NakedSingleTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Getting_Started
         { 2,4,6,0,7,0,0,3,8 },
@@ -34,7 +34,7 @@ public void NakedSingleTest1()
     [Test]
     public void NakedSingleTest2()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: https://sudoku9x9.com/naked_single.html
         { 0,0,0,1,0,2,0,0,0 },
diff --git a/SimpleSudokuSolver.Tests/Strategy/NakedTripleTests.cs b/SimpleSudokuSolver.Tests/Strategy/NakedTripleTests.cs
@@ -11,7 +11,7 @@ public class NakedTripleTests : BaseStrategyTest
     [Test]
     public void NakedTripleTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Naked_Candidates
         { 0,7,0,4,0,8,0,2,9 },
@@ -44,7 +44,7 @@ public void NakedTripleTest1()
     [Test]
     public void NakedTripleTest2()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://www.sudokuwiki.org/Naked_Candidates
         { 2,9,4,5,1,3,0,0,6 },
@@ -84,7 +84,7 @@ public void NakedTripleTest2()
     [Test]
     public void NakedTripleTest3()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         // From: http://hodoku.sourceforge.net/en/tech_naked.php, Naked Triple
         // http://www.sudokuwiki.org/sudoku.htm?bd=390000700000000650507000349049380506601054983853000400900800134002940865400000297
diff --git a/SimpleSudokuSolver.Tests/Strategy/SingleInCellsTests.cs b/SimpleSudokuSolver.Tests/Strategy/SingleInCellsTests.cs
@@ -11,7 +11,7 @@ public class SingleInCellsTests : BaseStrategyTest
     [Test]
     public void SingleInCellsTest1()
     {
-      var sudoku = new [,]
+      var sudoku = new[,]
       {
         { 0,0,0,0,0,0,0,1,0 },
         { 0,0,0,0,0,0,0,2,0 },
diff --git a/SimpleSudokuSolver/Strategy/NakedQuad.cs b/SimpleSudokuSolver/Strategy/NakedQuad.cs
@@ -118,14 +118,7 @@ public SingleStepSolution SolveSingleStep(SudokuPuzzle sudokuPuzzle)
     /// </summary>
     private int[] GetDistinctPotentialCellValuesInCandidates(params IEnumerable<int>[] items)
     {
-      List<int> result = new List<int>();
-
-      foreach (var item in items)
-      {
-        result.AddRange(item);
-      }
-
-      return result.Distinct().ToArray();
+      return items.SelectMany(x => x).Distinct().ToArray();
     }
   }
 }
diff --git a/SimpleSudokuSolver/Strategy/NakedTriple.cs b/SimpleSudokuSolver/Strategy/NakedTriple.cs
@@ -111,14 +111,7 @@ public SingleStepSolution SolveSingleStep(SudokuPuzzle sudokuPuzzle)
     /// </summary>
     private int[] GetDistinctPotentialCellValuesInCandidates(params IEnumerable<int>[] items)
     {
-      List<int> result = new List<int>();
-
-      foreach (var item in items)
-      {
-        result.AddRange(item);
-      }
-
-      return result.Distinct().ToArray();
+      return items.SelectMany(x => x).Distinct().ToArray();
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class HiddenPairTests : BaseStrategyTest`
`11`	`11`	`[Test]`
`12`	`12`	`public void HiddenPairTest1()`
`13`	`13`	`{`
`14`		`- var sudoku = new [,]`
	`14`	`+ var sudoku = new[,]`
`15`	`15`	`{`
`16`	`16`	`// From: http://www.sudokuwiki.org/Hidden_Candidates`
`17`	`17`	`{ 0,0,0,0,0,0,0,0,0 },`
`@@ -43,7 +43,7 @@ public void HiddenPairTest1()`
`43`	`43`	`[Test]`
`44`	`44`	`public void HiddenPairTest2()`
`45`	`45`	`{`
`46`		`- var sudoku = new [,]`
	`46`	`+ var sudoku = new[,]`
`47`	`47`	`{`
`48`	`48`	`// From: http://www.sudokuwiki.org/Hidden_Candidates`
`49`	`49`	`{ 7,2,0,4,0,8,0,3,0 },`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class HiddenQuadTests : BaseStrategyTest`
`11`	`11`	`[Test]`
`12`	`12`	`public void HiddenQuadTest1()`
`13`	`13`	`{`
`14`		`- var sudoku = new [,]`
	`14`	`+ var sudoku = new[,]`
`15`	`15`	`{`
`16`	`16`	`// From: http://www.sudokuwiki.org/Hidden_Candidates`
`17`	`17`	`{ 6,5,0,0,8,7,0,2,4 },`
`@@ -45,7 +45,7 @@ public void HiddenQuadTest1()`
`45`	`45`	`[Test]`
`46`	`46`	`public void HiddenQuadTest2()`
`47`	`47`	`{`
`48`		`- var sudoku = new [,]`
	`48`	`+ var sudoku = new[,]`
`49`	`49`	`{`
`50`	`50`	`// From: http://www.sudokuwiki.org/Hidden_Candidates`
`51`	`51`	`{ 9,0,1,5,0,0,0,4,6 },`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class HiddenTripleTests : BaseStrategyTest`
`11`	`11`	`[Test]`
`12`	`12`	`public void HiddenTripleTest1()`
`13`	`13`	`{`
`14`		`- var sudoku = new [,]`
	`14`	`+ var sudoku = new[,]`
`15`	`15`	`{`
`16`	`16`	`// From: http://www.sudokuwiki.org/Hidden_Candidates`
`17`	`17`	`{ 0,0,0,0,0,1,0,3,0 },`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class LockedCandidatesPointingTests : BaseStrategyTest`
`11`	`11`	`[Test]`
`12`	`12`	`public void LockedCandidatesPointingInColumnTest()`
`13`	`13`	`{`
`14`		`- var sudoku = new [,]`
	`14`	`+ var sudoku = new[,]`
`15`	`15`	`{`
`16`	`16`	`// From: https://sudoku9x9.com/locked_candidates.html`
`17`	`17`	`{ 0,1,2,0,0,0,0,0,0 },`
`@@ -40,7 +40,7 @@ public void LockedCandidatesPointingInColumnTest()`
`40`	`40`	`public void LockedCandidatesPointingInRowTest()`
`41`	`41`	`{`
`42`	`42`	`// From: https://sudoku9x9.com/locked_candidates.html, transposed`
`43`		`- var sudoku = new [,]`
	`43`	`+ var sudoku = new[,]`
`44`	`44`	`{`
`45`	`45`	`{ 0,0,0,0,0,0,0,0,0 },`
`46`	`46`	`{ 1,0,5,0,0,0,0,0,0 },`
`@@ -67,7 +67,7 @@ public void LockedCandidatesPointingInRowTest()`
`67`	`67`	`[Test]`
`68`	`68`	`public void LockedCandidatesPointingTest1()`
`69`	`69`	`{`
`70`		`- var sudoku = new [,]`
	`70`	`+ var sudoku = new[,]`
`71`	`71`	`{`
`72`	`72`	`// From: http://www.sudokuwiki.org/Intersection_Removal`
`73`	`73`	`{ 0,1,7,9,0,3,6,0,0 },`
`@@ -97,7 +97,7 @@ public void LockedCandidatesPointingTest1()`
`97`	`97`	`[Test]`
`98`	`98`	`public void LockedCandidatesPointingTest2()`
`99`	`99`	`{`
`100`		`- var sudoku = new [,]`
	`100`	`+ var sudoku = new[,]`
`101`	`101`	`{`
`102`	`102`	`// From: http://www.sudokuwiki.org/Intersection_Removal`
`103`	`103`	`{ 0,3,2,0,0,6,1,0,0 },`
`@@ -151,7 +151,7 @@ public void LockedCandidatesPointingTest2()`
`151`	`151`	`[Test]`
`152`	`152`	`public void LockedCandidatesPointingTest3()`
`153`	`153`	`{`
`154`		`- var sudoku = new [,]`
	`154`	`+ var sudoku = new[,]`
`155`	`155`	`{`
`156`	`156`	`// From: http://www.sudokuwiki.org/Intersection_Removal`
`157`	`157`	`{ 9,3,0,0,5,0,0,0,0 },`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class NakedPairTests : BaseStrategyTest`
`12`	`12`	`public void NakedPairInRowTest()`
`13`	`13`	`{`
`14`	`14`	`// From: https://sudoku9x9.com/naked_pair.html`
`15`		`- var sudoku = new [,]`
	`15`	`+ var sudoku = new[,]`
`16`	`16`	`{`
`17`	`17`	`{ 9,0,0,4,0,0,1,0,0 },`
`18`	`18`	`{ 0,5,6,0,0,0,0,0,0 },`
`@@ -37,7 +37,7 @@ public void NakedPairInRowTest()`
`37`	`37`	`public void NakedPairInColumnTest()`
`38`	`38`	`{`
`39`	`39`	`// From: https://sudoku9x9.com/naked_pair.html, transposed`
`40`		`- var sudoku = new [,]`
	`40`	`+ var sudoku = new[,]`
`41`	`41`	`{`
`42`	`42`	`{ 9,0,0,0,0,0,0,0,0 },`
`43`	`43`	`{ 0,5,7,0,0,0,0,0,0 },`
`@@ -61,7 +61,7 @@ public void NakedPairInColumnTest()`
`61`	`61`	`[Test]`
`62`	`62`	`public void NakedPairTest1()`
`63`	`63`	`{`
`64`		`- var sudoku = new [,]`
	`64`	`+ var sudoku = new[,]`
`65`	`65`	`{`
`66`	`66`	`// From: http://www.sudokuwiki.org/Naked_Candidates`
`67`	`67`	`{ 4,0,0,0,0,0,9,3,8 },`
`@@ -92,7 +92,7 @@ public void NakedPairTest1()`
`92`	`92`	`[Test]`
`93`	`93`	`public void NakedPairTest2()`
`94`	`94`	`{`
`95`		`- var sudoku = new [,]`
	`95`	`+ var sudoku = new[,]`
`96`	`96`	`{`
`97`	`97`	`// From: http://www.sudokuwiki.org/Naked_Candidates`
`98`	`98`	`{ 0,8,0,0,9,0,0,3,0 },`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class NakedQuadTests : BaseStrategyTest`
`11`	`11`	`[Test]`
`12`	`12`	`public void NakedQuadTest1()`
`13`	`13`	`{`
`14`		`- var sudoku = new [,]`
	`14`	`+ var sudoku = new[,]`
`15`	`15`	`{`
`16`	`16`	`// From: http://www.sudokuwiki.org/Naked_Candidates`
`17`	`17`	`// Contains one naked quad in block, and after that, one naked quad in row`
`@@ -41,7 +41,7 @@ public void NakedQuadTest1()`
`41`	`41`	`[Test]`
`42`	`42`	`public void NakedQuadTest2()`
`43`	`43`	`{`
`44`		`- var sudoku = new [,]`
	`44`	`+ var sudoku = new[,]`
`45`	`45`	`{`
`46`	`46`	`// From: http://www.manifestmaster.com/jetsudoku/nakedQuad.html`
`47`	`47`	`// Naked quad in column - must first use LockedCandidatesPointing to eliminate some candidates`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class NakedSingleTests : BaseStrategyTest`
`11`	`11`	`[Test]`
`12`	`12`	`public void NakedSingleTest1()`
`13`	`13`	`{`
`14`		`- var sudoku = new [,]`
	`14`	`+ var sudoku = new[,]`
`15`	`15`	`{`
`16`	`16`	`// From: http://www.sudokuwiki.org/Getting_Started`
`17`	`17`	`{ 2,4,6,0,7,0,0,3,8 },`
`@@ -34,7 +34,7 @@ public void NakedSingleTest1()`
`34`	`34`	`[Test]`
`35`	`35`	`public void NakedSingleTest2()`
`36`	`36`	`{`
`37`		`- var sudoku = new [,]`
	`37`	`+ var sudoku = new[,]`
`38`	`38`	`{`
`39`	`39`	`// From: https://sudoku9x9.com/naked_single.html`
`40`	`40`	`{ 0,0,0,1,0,2,0,0,0 },`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class NakedTripleTests : BaseStrategyTest`
`11`	`11`	`[Test]`
`12`	`12`	`public void NakedTripleTest1()`
`13`	`13`	`{`
`14`		`- var sudoku = new [,]`
	`14`	`+ var sudoku = new[,]`
`15`	`15`	`{`
`16`	`16`	`// From: http://www.sudokuwiki.org/Naked_Candidates`
`17`	`17`	`{ 0,7,0,4,0,8,0,2,9 },`
`@@ -44,7 +44,7 @@ public void NakedTripleTest1()`
`44`	`44`	`[Test]`
`45`	`45`	`public void NakedTripleTest2()`
`46`	`46`	`{`
`47`		`- var sudoku = new [,]`
	`47`	`+ var sudoku = new[,]`
`48`	`48`	`{`
`49`	`49`	`// From: http://www.sudokuwiki.org/Naked_Candidates`
`50`	`50`	`{ 2,9,4,5,1,3,0,0,6 },`
`@@ -84,7 +84,7 @@ public void NakedTripleTest2()`
`84`	`84`	`[Test]`
`85`	`85`	`public void NakedTripleTest3()`
`86`	`86`	`{`
`87`		`- var sudoku = new [,]`
	`87`	`+ var sudoku = new[,]`
`88`	`88`	`{`
`89`	`89`	`// From: http://hodoku.sourceforge.net/en/tech_naked.php, Naked Triple`
`90`	`90`	`// http://www.sudokuwiki.org/sudoku.htm?bd=390000700000000650507000349049380506601054983853000400900800134002940865400000297`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class SingleInCellsTests : BaseStrategyTest`
`11`	`11`	`[Test]`
`12`	`12`	`public void SingleInCellsTest1()`
`13`	`13`	`{`
`14`		`- var sudoku = new [,]`
	`14`	`+ var sudoku = new[,]`
`15`	`15`	`{`
`16`	`16`	`{ 0,0,0,0,0,0,0,1,0 },`
`17`	`17`	`{ 0,0,0,0,0,0,0,2,0 },`