Convert History table H in a local variable

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 500ed8b99a3571aecece8502a3fd60dee36010cf..94a0e5f9548afb864361ae826f2cef914703a302 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -26,6 +26,7 @@
 ////
 
 #include "depth.h"
+#include "history.h"
 #include "lock.h"
 #include "position.h"
 
@@ -37,8 +38,6 @@
 struct EvalInfo;
 struct SearchStack;
 
-extern SearchStack EmptySearchStack;
-
 /// MovePicker is a class which is used to pick one legal move at a time from
 /// the current position. It is initialized with a Position object and a few
 /// moves we have reason to believe are good. The most important method is
@@ -57,17 +56,16 @@ public:
     PH_TT_MOVE,        // Transposition table move
     PH_MATE_KILLER,    // Mate killer from the current ply
     PH_GOOD_CAPTURES,  // Queen promotions and captures with SEE values >= 0
-    PH_BAD_CAPTURES,   // Queen promotions and captures with SEE values < 0
-    PH_KILLER_1,       // Killer move 1 from the current ply (not used yet).
-    PH_KILLER_2,       // Killer move 2 from the current ply (not used yet).
+    PH_KILLERS,        // Killer moves from the current ply
     PH_NONCAPTURES,    // Non-captures and underpromotions
+    PH_BAD_CAPTURES,   // Queen promotions and captures with SEE values < 0
     PH_EVASIONS,       // Check evasions
     PH_QCAPTURES,      // Captures in quiescence search
     PH_QCHECKS,        // Non-capture checks in quiescence search
     PH_STOP
   };
 
-  MovePicker(const Position& p, bool pvnode, Move ttm, const SearchStack& ss, Depth d);
+  MovePicker(const Position& p, bool pvnode, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
   Move get_next_move();
   Move get_next_move(Lock& lock);
   int number_of_moves() const;
@@ -83,6 +81,7 @@ private:
   Move pick_move_from_list();
 
   const Position& pos;
+  const History& H;
   Move ttMove, mateKiller, killer1, killer2;
   Bitboard pinned, dc;
   MoveStack moves[256], badCaptures[64];
@@ -91,6 +90,7 @@ private:
   int phaseIndex;
   int numOfMoves, numOfBadCaptures;
   int movesPicked;
+  bool checkKillers, checkLegal;
   bool finished;
 };