X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=9459b8c2a389e9e2aec27e830ba078931b845df7;hp=9bc4f469a0f7c75faaa803e7d692cfcbdcaace1d;hb=55df3fa2d7631ed67e46f9433aa7f3a71c18e5e7;hpb=e25de55faca30c2196612fcb208d88802ad29bae

diff --git a/src/movepick.h b/src/movepick.h
index 9bc4f469..9459b8c2 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -25,13 +25,13 @@
 #include "search.h"
 #include "types.h"
 
-/// 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::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.
+
+/// MovePicker class is used to pick one pseudo legal move at a time from the
+/// current position. The most important method is 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.
 
 class MovePicker {
 
@@ -39,24 +39,25 @@ class MovePicker {
 
 public:
   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();
+  MovePicker(const Position&, Move, Depth, const History&, Square);
+  MovePicker(const Position&, Move, const History&, PieceType);
+  template<bool SpNode> Move next_move();
 
 private:
   void score_captures();
   void score_noncaptures();
   void score_evasions();
-  void go_next_phase();
+  void generate_next();
 
   const Position& pos;
   const History& H;
+  Search::Stack* ss;
   Depth depth;
   Move ttMove;
   MoveStack killers[2];
   Square recaptureSquare;
   int captureThreshold, phase;
-  MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
+  MoveStack *cur, *end, *endQuiets, *endBadCaptures;
   MoveStack moves[MAX_MOVES];
 };