added arguments; added ConsistentTryCount; added Elapsed; fixed mrv for empty sudoku

uqac-ia-sudoku-csp/Program.cs

@@ -1,4 +1,5 @@
 using System;
+using uqac_ia_sudoku_csp.Interfaces;
 using uqac_ia_sudoku_csp.Solver;
 using uqac_ia_sudoku_csp.Solver.Generators;
 using uqac_ia_sudoku_csp.Solver.NextValueChoosers;
@@ -9,20 +10,65 @@ namespace uqac_ia_sudoku_csp
     {
         public static void Main(string[] args)
         {
+            var generatorType = "-";
+            if (args.Length > 0)
+            {
+                generatorType = args[0];
+            }
+            var valueChooser = "mrv";
+            if (args.Length > 1)
+            {
+                valueChooser = args[1];
+            }
+            var emptyCharacters = "0 .";
+            if (args.Length > 2)
+            {
+                emptyCharacters = args[2];
+            }
+
+            object data;
+            IGenerator generator;
             var board = new Board("123456789");
 
-            var generator = new FileGenerator();
-            generator.Generate(board, new FileGeneratorDbo
+            if (generatorType == "-")
+            {
+                generator = new StdInGenerator();
+                data = emptyCharacters;
+            }
+            else if (generatorType == "0")
             {
-                EmptyCharacters = "0 .",
-                FilePath = "../sample/04.txt"
-            });
+                generator = new EmptyGenerator();
+                data = null;
+            }
+            else
+            {
+                generator = new FileGenerator();
+                data = new FileGeneratorDbo
+                {
+                    EmptyCharacters = emptyCharacters,
+                    FilePath = generatorType
+                };
+            }
+            generator.Generate(board, data);
             board.Print(Console.Out);
 
-            var solver = new BacktrackSearch(new MRVNextValueChooser());
-            var start = DateTime.Now;
+            INextValueChooser nextValueChooser = null;
+            if (valueChooser == "mrv")
+            {
+                nextValueChooser = new MRVNextValueChooser();
+            }
+            else if (valueChooser == "basic")
+            {
+                nextValueChooser = new BasicNextValueChooser();
+            }
+            else
+            {
+                Console.Error.WriteLine("Invalid next value chooser");
+                Environment.Exit(64);
+            }
+
+            var solver = new BacktrackSearch(nextValueChooser);
             var resolved = solver.Resolve(board);
-            var end = DateTime.Now;
 
             if (resolved.Success)
             {
@@ -34,7 +80,8 @@ namespace uqac_ia_sudoku_csp
                 Console.WriteLine("Not resolved");
             }
             Console.WriteLine($"{resolved.TryCount} tries");
-            Console.WriteLine($"{(end - start).TotalMilliseconds} ms");
+            Console.WriteLine($"{resolved.ConsistentTryCount} consistent tries");
+            Console.WriteLine($"{resolved.Elapsed.TotalMilliseconds} ms");
         }
     }
 }

uqac-ia-sudoku-csp/Solver/BacktrackSearch.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using uqac_ia_sudoku_csp.Interfaces;
 using uqac_ia_sudoku_csp.Solver.Constraints;
@@ -25,7 +26,10 @@ namespace uqac_ia_sudoku_csp.Solver
         {
             var domain = Enumerable.Range(0, board.Size).ToList();
             var result = new SolverResult();
+            var start = DateTime.Now;
             result.Success = RecursiveResolve(board, result, domain);
+            var end = DateTime.Now;
+            result.Elapsed = end - start;
             return result;
         }
 
@@ -45,6 +49,7 @@ namespace uqac_ia_sudoku_csp.Solver
                     board.SetNumber(x, y, value);
                     if (board.IsConsistent(x, y, Constraints))
                     {
+                        ++result.ConsistentTryCount;
                         if (RecursiveResolve(board, result, domain))
                         {
                             return true;

uqac-ia-sudoku-csp/Solver/Generator.cs

@@ -1,10 +0,0 @@
-namespace uqac_ia_sudoku_csp
-{
-    public class Generator
-    {
-        public void Generate(Board board, object data)
-        {
-//            board.SetNumber(0, 0, 0);
-        }
-    }
-}

uqac-ia-sudoku-csp/Solver/NextValueChoosers/BasicValueChooser.cs → uqac-ia-sudoku-csp/Solver/NextValueChoosers/BasicNextValueChooser.cs

@@ -3,7 +3,7 @@ using uqac_ia_sudoku_csp.Interfaces;
 
 namespace uqac_ia_sudoku_csp.Solver.NextValueChoosers
 {
-    public class BasicValueChooser : INextValueChooser
+    public class BasicNextValueChooser : INextValueChooser
     {
         public void SelectVariable(Board board, out int x, out int y, IList<IConstraint> constraints)
         {

uqac-ia-sudoku-csp/Solver/NextValueChoosers/MRVNextValueChooser.cs

@@ -8,7 +8,7 @@ namespace uqac_ia_sudoku_csp.Solver.NextValueChoosers
         public void SelectVariable(Board board, out int x, out int y, IList<IConstraint> constraints)
         {
             var avail = 1;
-            while (avail < board.Size)
+            while (avail <= board.Size)
             {
                 for (var xx = 0; xx < board.Size; ++xx)
                 {

uqac-ia-sudoku-csp/Solver/SolverResult.cs

@@ -1,9 +1,15 @@
-namespace uqac_ia_sudoku_csp.Solver
+using System;
+
+namespace uqac_ia_sudoku_csp.Solver
 {
     public class SolverResult
     {
         public int TryCount { get; set; }
 
+        public int ConsistentTryCount { get; set; }
+
         public bool Success { get; set; }
+
+        public TimeSpan Elapsed { get; set; }
     }
 }