Use gain table to order non-captures

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 09ad1c39bfe995ae791e3c1af58ad6b45e17b848..69cf6ff67404ea740850aa169e9f8f8dcb90f542 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -27,7 +27,6 @@
 
 #include "depth.h"
 #include "history.h"
-#include "lock.h"
 #include "position.h"
 
 
@@ -52,22 +51,20 @@ class MovePicker {
 public:
   MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
   Move get_next_move();
-  Move get_next_move(Lock& lock);
   int number_of_evasions() const;
 
 private:
   void score_captures();
   void score_noncaptures();
-  void score_evasions();
+  void score_evasions_or_checks();
   void go_next_phase();
 
   const Position& pos;
   const History& H;
   MoveStack ttMoves[2], killers[2];
-  bool finished;
   int phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastBadCapture;
+  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *lastBadCapture;
   Bitboard pinned;
   MoveStack moves[256], badCaptures[64];
 };