Aspiration window

Bit-Genie/src/benchmark.cpp

@@ -96,10 +96,13 @@ namespace BenchMark
                 std::cout << fen;
                 throw std::runtime_error("Invalid fen in bench");
             }
+            Search::Info info;
+            info.position = &position;
+            info.limits.max_depth = 12;
 
-            uint64_t count = bench_search_position(position);
+            auto count = Search::bestmove(info, false);
+            std::cout << fen << ": " << count << '\n';
             nodes += count;
-            std::cout << fen << ": " << nodes << std::endl;
         }
         watch.stop();
 

Bit-Genie/src/main.cpp

@@ -24,6 +24,6 @@ int main(int argc, char **argv)
 {
     Attacks::init();
     ZobristKey::init();
-    init_lmr_array();
-    uci_input_loop(argc, argv);
+    Search::init();
+    UCI::init(argc, argv);
 }

Bit-Genie/src/misc.h

@@ -52,9 +52,6 @@ class SHistory;
 class TTable;
 class ZobristKey;
 
-struct SearchInfo;
-struct SearchLimits;
-struct Search;
 struct TEntry;
 
 template <typename E>

Bit-Genie/src/moveorder.cpp

@@ -89,8 +89,9 @@ static int16_t see(Position &position, Move move)
 }
 
 template <bool quiet = false>
-static void order_normal_movelist(Position &position, Movelist &movelist, Search &search)
+static void order_normal_movelist(Movelist &movelist, Search::Info &search)
 {
+    Position& position = *search.position;
     for (auto &move : movelist)
     {
         if constexpr (!quiet)
@@ -104,29 +105,31 @@ static void order_normal_movelist(Position &position, Movelist &movelist, Search
               [](Move rhs, Move lhs) { return move_score(rhs) > move_score(lhs); });
 }
 
-void sort_qmovelist(Movelist &movelist, Position &position, Search &search)
+void sort_qmovelist(Movelist &movelist, Search::Info& search)
 {
-    order_normal_movelist<false>(position, movelist, search);
+    order_normal_movelist<false>(movelist, search);
 }
 
-MovePicker::MovePicker(Position &p, Search &s)
-    : position(&p), search(&s)
+MovePicker::MovePicker(Search::Info& s)
+    : search(&s)
 {
     stage = Stage::HashMove;
 }
 
 bool MovePicker::next(Move &move)
 {
+    Position& position = *search->position;
+
     auto can_move = [&](Move m) {
-        return position->move_is_pseudolegal(m) && position->move_is_legal(m);
+        return position.move_is_pseudolegal(m) && position.move_is_legal(m);
     };
 
     if (stage == Stage::HashMove)
     {
         stage = Stage::GenNoisy;
-        auto& entry = TT.retrieve(*position);
+        auto& entry = TT.retrieve(position);
 
-        if (entry.hash == position->key.data() && can_move((Move)entry.move))
+        if (entry.hash == position.key.data() && can_move((Move)entry.move))
         {
             move = (Move)entry.move;
             return true;
@@ -135,8 +138,8 @@ bool MovePicker::next(Move &move)
 
     if (stage == Stage::GenNoisy)
     {
-        gen.generate<MoveGenType::noisy>(*position);
-        order_normal_movelist(*position, gen.movelist, *search);
+        gen.generate<MoveGenType::noisy>(position);
+        order_normal_movelist(gen.movelist, *search);
 
         current = gen.movelist.begin();
         stage = Stage::GiveGoodNoisy;
@@ -155,7 +158,7 @@ bool MovePicker::next(Move &move)
     if (stage == Stage::Killer1)
     {
         stage = Stage::Killer2;
-        Move killer = search->killers.first(search->info.ply);
+        Move killer = search->killers.first(search->stats.ply);
 
         if (can_move(killer))
         {
@@ -167,7 +170,7 @@ bool MovePicker::next(Move &move)
     if (stage == Stage::Killer2)
     {
         stage = Stage::GiveBadNoisy;
-        Move killer = search->killers.second(search->info.ply);
+        Move killer = search->killers.second(search->stats.ply);
 
         if (can_move(killer))
         {
@@ -189,9 +192,9 @@ bool MovePicker::next(Move &move)
     if (stage == Stage::GenQuiet)
     {
         gen.movelist.clear();
-        gen.generate<MoveGenType::quiet>(*position);
+        gen.generate<MoveGenType::quiet>(position);
 
-        order_normal_movelist<true>(*position, gen.movelist, *search);
+        order_normal_movelist<true>(gen.movelist, *search);
         current = gen.movelist.begin();
         stage = Stage::GiveQuiet;
     }

Bit-Genie/src/moveorder.h

@@ -16,8 +16,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
+#include "search.h"
 #include "movegen.h"
-
 class MovePicker
 {
 public:
@@ -33,17 +33,16 @@ class MovePicker
         GiveQuiet
     };
 
-    MovePicker(Position &, Search &);
+    MovePicker(Search::Info&);
 
     bool next(Move &);
 
     MoveGenerator<true> gen;
     Stage stage = Stage::HashMove;
+
 private:
-    Position *position;
-    Search *search;
-
+    Search::Info *search;
     Movelist::iterator current;
 };
 
-void sort_qmovelist(Movelist &, Position &, Search &search);
+void sort_qmovelist(Movelist &, Search::Info& );