X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=d0ced0474ffd901e6b34275acf520147001fe506;hp=d97bb62909c71ceb38ed0affba20216994b99bd2;hb=8647fbd6ed11c60282e84e4b486a7e8258c88483;hpb=afae86bfb49471113f14f9f0f56f2a08d052242f

diff --git a/src/movepick.h b/src/movepick.h
index d97bb629..d0ced047 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -20,29 +20,30 @@
 #if !defined MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
-#include "depth.h"
 #include "history.h"
+#include "move.h"
 #include "position.h"
+#include "types.h"
 
 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::pick_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 be strongest first.
+/// attempts to return the moves which are most likely to get a cut-off first.
 
 class MovePicker {
 
-  MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
+  MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
 
 public:
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value beta);
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h);
+  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();
-  int number_of_evasions() const;
 
 private:
   void score_captures();
@@ -52,23 +53,13 @@ private:
 
   const Position& pos;
   const History& H;
-  Bitboard pinned;
-  MoveStack ttMoves[2], killers[2];
-  int badCaptureThreshold, phase;
+  Depth depth;
+  Move ttMove;
+  MoveStack killers[2];
+  int captureThreshold, phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
-  MoveStack moves[MOVES_MAX];
+  MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
+  MoveStack moves[MAX_MOVES];
 };
 
-
-/// MovePicker::number_of_evasions() simply returns the number of moves in
-/// evasions phase. It is intended to be used in positions where the side to
-/// move is in check, for detecting checkmates or situations where there is
-/// only a single reply to check.
-/// WARNING: It works as long as PH_EVASIONS is the _only_ phase for evasions.
-
-inline int MovePicker::number_of_evasions() const {
-  return int(lastMove - moves);
-}
-
 #endif // !defined(MOVEPICK_H_INCLUDED)