X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=72f52459799526c4182de23a6c5b1daca7ab9b16;hp=04e5fb5e4a89a79474e91524777b6da2608338c7;hb=6058e7cf60b043cfb142604d0956c32c24098b00;hpb=0fcda095df1caa860e8e3f3a714d5545ec9dc122

diff --git a/src/movepick.h b/src/movepick.h
index 04e5fb5e..72f52459 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
@@ -22,26 +22,26 @@
 
 #include "history.h"
 #include "position.h"
+#include "search.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::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);
-  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();
@@ -51,12 +51,14 @@ private:
 
   const Position& pos;
   const History& H;
-  Bitboard pinned;
-  MoveStack ttMoves[2], killers[2];
-  int badCaptureThreshold, phase;
+  Depth depth;
+  Move ttMove;
+  MoveStack killers[2];
+  Square recaptureSquare;
+  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];
 };
 
 #endif // !defined(MOVEPICK_H_INCLUDED)