Split non capture in two sets when ordering

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index fb3d4a62da030af55793b464da69c66c43dcf652..c4d665a93a3cb34eb95a679e14fd5b084021dd5b 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -27,11 +27,11 @@
 
 struct SearchStack;
 
-/// 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
+/// MovePicker is a class which is used to pick one pseudo 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
-/// MovePicker::get_next_move(), which returns a new legal move each time it
-/// is called, until there are no legal moves left, when MOVE_NONE is returned.
+/// MovePicker::get_next_move(), which returns a new pseudo legal move each time
+/// it is called, until there are no moves left, when MOVE_NONE is returned.
 /// In order to improve the efficiency of the alpha beta algorithm, MovePicker
 /// attempts to return the moves which are most likely to get a cut-off first.
 
@@ -42,8 +42,8 @@ class MovePicker {
 public:
   MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
   MovePicker(const Position&, Move, Depth, const History&);
+  MovePicker(const Position&, Move, const History&, int parentCapture);
   Move get_next_move();
-  bool isBadCapture() const;
 
 private:
   void score_captures();
@@ -53,11 +53,11 @@ private:
 
   const Position& pos;
   const History& H;
-  Bitboard pinned;
-  MoveStack ttMoves[2], killers[2];
-  int badCaptureThreshold, phase;
+  Move ttMove;
+  MoveStack killers[2];
+  int captureThreshold, phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
+  MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
   MoveStack moves[MAX_MOVES];
 };