project-euler

commit 6c584817012d0e28a2483d577b28d7fdd6b22e5a
parent ceee511b3377cbb5df7d76b87d976e7f18fdd839
Author: mpizzzle <m@michaelpercival.xyz>
Date:   Tue, 29 Sep 2020 20:27:11 +0100

more refactoring

Diffstat:
M
Euler_96.cpp
 | 
32
+++++++++++++-------------------

1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/Euler_96.cpp b/Euler_96.cpp
@@ -8,7 +8,7 @@
 typedef std::array<std::array<int, 9>, 9> sudoku;
 typedef std::unordered_set<int> set;
 
-bool check(sudoku bifurcation) {
+bool check(sudoku& bifurcation) {
     for (int i = 0; i < 9; ++i) {
         set h, v;
 
@@ -105,6 +105,17 @@ sudoku reduce(sudoku puzzle) {
                             set matches;
 
                             for (int x : missing) {
+                                if (h[i].find(x) == h[i].end() && v[j].find(x) == v[j].end()) {
+                                    matches.insert(x);
+                                }
+                            }
+
+                            if (matches.size() == 1) {
+                                found(puzzle, *matches.begin(), i, j, k, l, reduced, vert, h, v, subgroup, missing);
+                                break;
+                            }
+
+                            for (int x : missing) {
                                 if (subgroup.find(x) == subgroup.end()) {
                                     if (((puzzle[(l * 3) + ((i + 1) % 3)][j] > 0 && !vert)
                                     || h[(l * 3) + ((i + 1) % 3)].find(x) != h[(l * 3) + ((i + 1) % 3)].end())
@@ -118,23 +129,6 @@ sudoku reduce(sudoku puzzle) {
                                         break;
                                     }
                                 }
-
-                                if (h[i].find(x) != h[i].end() || v[j].find(x) != v[j].end()) {
-                                    matches.insert(x);
-                                }
-                            }
-
-                            set left_join;
-
-                            for (int x : missing) {
-                                if (matches.find(x) == matches.end()) {
-                                    left_join.insert(x);
-                                }
-                            }
-
-                            if (left_join.size() == 1) {
-                                found(puzzle, *left_join.begin(), i, j, k, l, reduced, vert, h, v, subgroup, missing);
-                                break;
                             }
                         }
                     }
@@ -213,7 +207,7 @@ int Euler::Sudoku()
 
     file.close();
 
-    for (int j = 0; j < 50; ++j) {
+    for (int j = 0; j < 5; ++j) {
         std::cout << "next puzzle " << j << ":" << std::endl;
         sudoku puzzle = sudokus[j];
         print(puzzle);