Rename getters functions removing 'get_' prefix

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 9bab654798a3819a9e760d78508669748a7af764..9f2be29144e82b8b7a1c94d86e64bc4abc98d984 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -21,16 +21,14 @@
 #define MOVEPICK_H_INCLUDED
 
 #include "history.h"
-#include "move.h"
 #include "position.h"
+#include "search.h"
 #include "types.h"
 
-struct SearchStack;
-
 /// 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 pseudo legal move each time
+/// MovePicker::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.
@@ -40,10 +38,10 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
 
 public:
-  MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
-  MovePicker(const Position&, Move, Depth, const History&);
-  Move get_next_move();
-  bool isBadCapture() const;
+  MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Value);
+  MovePicker(const Position&, Move, Depth, const History&, Square recaptureSq);
+  MovePicker(const Position&, Move, const History&, PieceType parentCapture);
+  Move next_move();
 
 private:
   void score_captures();
@@ -53,11 +51,13 @@ private:
 
   const Position& pos;
   const History& H;
+  Depth depth;
   Move ttMove;
   MoveStack killers[2];
-  int badCaptureThreshold, phase;
+  Square recaptureSquare;
+  int captureThreshold, phase;
   const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
+  MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
   MoveStack moves[MAX_MOVES];
 };