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

diff --git a/src/movepick.h b/src/movepick.h
index 5e4cf779..9bc4f469 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -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&);
-  MovePicker(const Position&, Move, const History&, int threshold);
-  Move get_next_move();
+  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();
@@ -56,8 +54,8 @@ private:
   Depth depth;
   Move ttMove;
   MoveStack killers[2];
+  Square recaptureSquare;
   int captureThreshold, phase;
-  const uint8_t* phasePtr;
   MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
   MoveStack moves[MAX_MOVES];
 };