Try bad captures before non-captures

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 09ad1c39bfe995ae791e3c1af58ad6b45e17b848..9e81e218247a165269a8d4ed44392352501d0886 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"
 
 
@@ -50,24 +49,22 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
 
 public:
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, Value beta = -VALUE_INFINITE);
   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;
+  int badCaptureThreshold, phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastBadCapture;
+  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *lastBadCapture;
   Bitboard pinned;
   MoveStack moves[256], badCaptures[64];
 };