more IQ puzzle, cleanup, refactor 2d grid tilings

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13)
 project(dlx)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

common/Element.cpp

@@ -1,5 +1,3 @@
-#include <string>
-
 #include "Element.hpp"
 
 using namespace std;

common/Element.hpp

@@ -1,6 +1,8 @@
 #ifndef ELEMENT_H
 #define ELEMENT_H
 
+#include <string>
+
 class Header;
 
 class Element

common/Matrix.cpp

@@ -1,13 +1,14 @@
+#include "Matrix.hpp"
+
+#include "Element.hpp"
+
 #include <algorithm>
 #include <functional>
 #include <iomanip>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#include "Matrix.hpp"
-#include "Element.hpp"
-
 using namespace std;
 
 

common/Matrix.hpp

@@ -1,13 +1,10 @@
 #ifndef MATRIX_H
 #define MATRIX_H
 
-#include <functional>
-#include <map>
-#include <string>
-#include <vector>
-
 #include "Element.hpp"
 
+#include <map>
+
 
 class Matrix
 {

common/Puzzle.cpp

@@ -1,10 +1,9 @@
-#include <iostream>
-#include <vector>
-
 #include "Puzzle.hpp"
 
 #include "Matrix.hpp"
 
+#include <iostream>
+
 using namespace std;
 
 

common/Puzzle.hpp

@@ -1,12 +1,13 @@
 #ifndef PUZZLE_H
 #define PUZZLE_H
 
-#include <vector>
-
 #include "Matrix.hpp"
 
+#include <vector>
+
 class Element;
 
+
 class Puzzle
 {
 public:
@@ -18,7 +19,7 @@ class Puzzle
 protected:
 
     virtual void init() = 0;
-    virtual void print(std::vector<Element *>& solution) = 0;
+    virtual void print(std::vector<Element *> const& solution) = 0;
 
     struct SubGoal {
         Matrix matrix;

main.cpp

@@ -1,9 +1,3 @@
-#include <functional>
-#include <iostream>
-#include <memory>
-#include <string>
-#include <vector>
-
 #include "Iq.hpp"
 #include "Pentominoes.hpp"
 #include "Pyramid.hpp"
@@ -14,6 +8,12 @@
 #include "boost/any.hpp"
 #include "boost/program_options.hpp"
 
+#include <functional>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
+
 using namespace std;
 namespace po = boost::program_options;
 

queens/Queens.cpp

@@ -76,7 +76,7 @@ void Queens::init()
 }
 
 
-void Queens::print(vector<Element *>& solution)
+void Queens::print(vector<Element *> const& solution)
 {
     static int count = 0;
 
@@ -92,7 +92,7 @@ void Queens::print(vector<Element *>& solution)
     cout << "#" << ++count << ":" << endl;
     for(int f=0; f<n; ++f) {
         for(int r=0; r<n; ++r) {
-            cout << (queens.count(pair<int, int>(r, f)) ? "\u265b " : "\u30fb"); 
+            cout << (queens.count(pair<int, int>(r, f)) ? "\u265b " : "\u30fb");
         }
         cout << endl;
     }

queens/Queens.hpp

@@ -1,13 +1,14 @@
 #ifndef QUEENS_H
 #define QUEENS_H
 
-#include <vector>
-
 #include "Puzzle.hpp"
 
+#include <vector>
+
 class Element;
 class Matrix;
 
+
 class Queens : public Puzzle
 {
 public:
@@ -17,7 +18,7 @@ class Queens : public Puzzle
 private:
 
     void init() override;
-    void print(std::vector<Element *>& solution) override;
+    void print(std::vector<Element *> const& solution) override;
 
     int n;
 

sudoku/Sudoku.cpp

@@ -1,8 +1,8 @@
+#include "Sudoku.hpp"
+
 #include <iostream>
 #include <sstream>
 
-#include "Sudoku.hpp"
-
 using namespace std;
 
 
@@ -87,7 +87,7 @@ void Sudoku::init()
 }
 
 
-void Sudoku::print(std::vector<Element *>& solution)
+void Sudoku::print(std::vector<Element *> const& solution)
 {
     int board[9][10]={0};
     for(auto& e: solution) {

sudoku/Sudoku.hpp

@@ -3,6 +3,7 @@
 
 #include "Puzzle.hpp"
 
+
 class Sudoku : public Puzzle
 {
 public:
@@ -12,7 +13,7 @@ class Sudoku : public Puzzle
 private:
 
     void init() override;
-    void print(std::vector<Element *>& solution) override;
+    void print(std::vector<Element *> const& solution) override;
 
 };
 

tiling/CMakeLists.txt

@@ -1,6 +1,8 @@
 add_library(tiling OBJECT
     Iq.cpp
     Iq.hpp
+    Ortho2d.cpp
+    Ortho2d.hpp
     Pentominoes.cpp
     Pentominoes.hpp
     Pyramid.cpp