generalized the position counter

src/model/ais/ai.cpp

@@ -4,7 +4,10 @@
 #include <ostream>
 #include <thread>
 
+static long int position_counter = 0;
+
 Move ai::AI::search(const Board& b) {
+    position_counter = 0;
     Move result;
 
     std::condition_variable cv;
@@ -47,6 +50,13 @@ Move ai::AI::search(const Board& b) {
     // Ensure timer thread is also stopped
     timer_thread.join();
 
-    std::cout << "Took " << elapsed << " ms" << std::endl;
+    std::cout << "Took " << elapsed << " ms, " << "Looked at "
+              << position_counter << " positions" << std::endl;
     return result;
 }
+
+int ai::AI::eval(const Board& b) {
+    int ret = _eval(b);
+    position_counter++;
+    return ret;
+}

src/model/ais/ai.hpp

@@ -20,8 +20,9 @@ namespace ai {
         std::atomic<bool> stop_computation = false;
 
         Move search(const Board& b);
+        int eval(const Board&);
 
-        virtual int eval(const Board&) = 0;
+        virtual int _eval(const Board&) = 0;
     };
 
     struct v0_random : public AI {
@@ -29,7 +30,7 @@ namespace ai {
 
         Move _search(const Board&) override;
 
-        int eval(const Board&) override {
+        int _eval(const Board&) override {
             return 0;
         };
     };
@@ -41,7 +42,7 @@ namespace ai {
         v1_pure_minimax(bool w, std::chrono::milliseconds tt): AI(w, tt) {}
 
         Move _search(const Board&) override;
-        int eval(const Board&) override;
+        int _eval(const Board&) override;
     };
 
     class v2_alpha_beta : public AI {
@@ -52,7 +53,7 @@ namespace ai {
         v2_alpha_beta(bool w, std::chrono::milliseconds tt): AI(w, tt) {}
 
         virtual Move _search(const Board&) override;
-        virtual int eval(const Board&) override;
+        virtual int _eval(const Board&) override;
     };
 
     class v3_AB_ordering : public AI {
@@ -63,7 +64,7 @@ namespace ai {
         v3_AB_ordering(bool w, std::chrono::milliseconds tt): AI(w, tt) {}
 
         virtual Move _search(const Board&) override;
-        virtual int eval(const Board&) override;
+        virtual int _eval(const Board&) override;
     };
 
     class v4_search_captures : public v3_AB_ordering {
@@ -86,7 +87,7 @@ namespace ai {
         v5_better_endgame(bool w, std::chrono::milliseconds tt)
             : v4_search_captures(w, tt) {}
 
-        virtual int eval(const Board&) override;
+        virtual int _eval(const Board&) override;
     };
 
     class v6_iterative_deepening : public v5_better_endgame {

src/model/ais/v1_pure_minimax.cpp

@@ -7,10 +7,7 @@
 
 #define MULTITHREADED 1
 
-static int position_counter = 0;
-
 Move ai::v1_pure_minimax::_search(const Board& b) {
-    position_counter = 0;
     std::vector<Move> moves = b.all_legal_moves();
 
     Move best_move;
@@ -52,7 +49,6 @@ Move ai::v1_pure_minimax::_search(const Board& b) {
         }
     }
 #endif
-    std::cout << "Looked at " << position_counter << " positions" << std::endl;
     return best_move;
 }
 
@@ -78,8 +74,7 @@ int ai::v1_pure_minimax::_search(const Board& b, int depth) {
     return best_evaluation;
 }
 
-int ai::v1_pure_minimax::eval(const Board& b) {
+int ai::v1_pure_minimax::_eval(const Board& b) {
-    position_counter++;
     int white_eval = count_material(b, Colour::White);
     int black_eval = count_material(b, Colour::Black);
 

src/model/ais/v2_alpha_beta.cpp

@@ -7,11 +7,7 @@
 
 #define MULTITHREADED 1
 
-
-static int position_counter = 0;
-
 Move ai::v2_alpha_beta::_search(const Board& b) {
-    position_counter = 0;
     std::vector<Move> moves = b.all_legal_moves();
 
     Move best_move;
@@ -53,7 +49,6 @@ Move ai::v2_alpha_beta::_search(const Board& b) {
         }
     }
 #endif
-    std::cout << "Looked at " << position_counter << " positions" << std::endl;
     return best_move;
 }
 
@@ -79,8 +74,7 @@ int ai::v2_alpha_beta::_search(const Board& b, int depth, int alpha, int beta) {
     return alpha;
 }
 
-int ai::v2_alpha_beta::eval(const Board& b) {
+int ai::v2_alpha_beta::_eval(const Board& b) {
-    position_counter++;
     int white_eval = count_material(b, Colour::White);
     int black_eval = count_material(b, Colour::Black);
 

src/model/ais/v3_AB_ordering.cpp

@@ -8,11 +8,7 @@
 
 #define MULTITHREADED 1
 
-
-static int position_counter;
-
 Move ai::v3_AB_ordering::_search(const Board& b) {
-    position_counter = 0;
     std::vector<Move> moves = b.all_legal_moves();
 
     Move best_move;
@@ -56,7 +52,6 @@ Move ai::v3_AB_ordering::_search(const Board& b) {
         }
     }
 #endif
-    std::cout << "Looked at " << position_counter << " positions" << std::endl;
     return best_move;
 }
 
@@ -88,8 +83,7 @@ int ai::v3_AB_ordering::_ab_search(
     return alpha;
 }
 
-int ai::v3_AB_ordering::eval(const Board& b) {
+int ai::v3_AB_ordering::_eval(const Board& b) {
-    position_counter++;
     int white_eval = count_material(b, Colour::White);
     int black_eval = count_material(b, Colour::Black);
 

src/model/ais/v4_search_captures.cpp

@@ -6,9 +6,6 @@
 
 #define MULTITHREADED 1
 
-
-static int position_counter;
-
 int ai::v4_search_captures::_ab_search(
     const Board& b, int depth, int alpha, int beta
 ) {

src/model/ais/v5_better_endgames.cpp

@@ -36,8 +36,8 @@ static float endgame_phase_weight(int material_count_no_pawns) {
     return 1.f - std::min(1.f, material_count_no_pawns * multiplier);
 }
 
-int ai::v5_better_endgame::eval(const Board& b) {
+int ai::v5_better_endgame::_eval(const Board& b) {
-    int old_eval = v4_search_captures::eval(b);
+    int old_eval = v4_search_captures::_eval(b);
     Colour attacking_colour = b.white_to_play ? White : Black;
     Colour defending_colour = b.white_to_play ? Black : White;
     return old_eval

src/model/ais/v6_iterative_deepening.cpp

@@ -5,6 +5,8 @@
 
 #include <map>
 
+static int position_counter = 0;
+
 Move ai::v6_iterative_deepening::_search(const Board& b) {
     ThreadPool pool(std::thread::hardware_concurrency());
     std::vector<Move> moves = b.all_legal_moves();