From 65c17741f9fde574f9925e8955600f59b9468814 Mon Sep 17 00:00:00 2001
From: Joel Therrien <joel@joeltherrien.ca>
Date: Sun, 18 Oct 2020 15:15:40 -0700
Subject: [PATCH] Add more debug options & tweak difficulty settings

---
 src/bin/generator.rs | 18 ++++++++++++++----
 src/solver.rs        |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/bin/generator.rs b/src/bin/generator.rs
index e5aa3d9..e7b626a 100644
--- a/src/bin/generator.rs
+++ b/src/bin/generator.rs
@@ -56,6 +56,9 @@ impl Difficulty {
         controller
     }
 
+    // Note that we only need to check for minimum requirements because easier difficulities
+    // have turned off parts of the solver. For example, Difficulty::EASY cannot have any
+    // guesses simply by virtue of not allowing guesses during the generation process.
     fn meets_minimum_requirements(&self, solve_statistics: &SolveStatistics) -> bool {
         match self {
             Difficulty::Challenge => {
@@ -64,12 +67,12 @@ impl Difficulty {
                     && (solve_statistics.useful_constraints > 20)
             }
             Difficulty::Hard => {
-                (solve_statistics.possibility_groups > 20)
-                    && (solve_statistics.useful_constraints > 20)
+                (solve_statistics.possibility_groups > 5)
+                    && (solve_statistics.useful_constraints > 10)
             }
             Difficulty::Medium => {
-                (solve_statistics.possibility_groups > 10)
-                    && (solve_statistics.useful_constraints > 10)
+                (solve_statistics.possibility_groups > 5)
+                    && (solve_statistics.useful_constraints > 5)
             }
             Difficulty::Easy => true, // easy has no minimum
         }
@@ -162,6 +165,7 @@ fn main() {
             max_attempts,
             max_hints,
             &AtomicBool::new(false),
+            debug
         )
     } else {
         run_multi_threaded(
@@ -256,6 +260,7 @@ fn run_multi_threaded(
                 thread_attempts,
                 max_hints,
                 should_stop,
+                debug
             );
 
             let mut result_was_some = false;
@@ -308,6 +313,7 @@ fn get_puzzle_matching_conditions(
     max_attempts: i32,
     max_hints: i32,
     should_stop: &AtomicBool,
+    debug: bool
 ) -> (Option<(Grid, SolveStatistics, i32)>, i32) {
     let mut num_attempts = 0;
 
@@ -316,6 +322,10 @@ fn get_puzzle_matching_conditions(
             sudoku_solver::generator::generate_grid(rng, &solve_controller);
         num_attempts += 1;
 
+        if debug {
+            println!("Found puzzle with {:#?}", solve_statistics);
+        }
+
         if difficulty.meets_minimum_requirements(&solve_statistics) && num_hints <= max_hints {
             return (Some((grid, solve_statistics, num_hints)), num_attempts);
         }
diff --git a/src/solver.rs b/src/solver.rs
index 6796119..4594263 100644
--- a/src/solver.rs
+++ b/src/solver.rs
@@ -114,7 +114,7 @@ impl SolveController {
 /// that the method make at least one change to the line it was originally called on, whether that
 /// be setting a value or adjusting the possibilities in a cell. Multiple contributions in one call
 /// of the strategy on a `Section` are only counted as one contribution.
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Debug)]
 pub struct SolveStatistics {
     pub singles: u32,
     pub hidden_singles: u32,