X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=9e81e218247a165269a8d4ed44392352501d0886;hp=bcd5eb14e1b57cb77d92d81cd3bd5a8640920bb8;hb=14dbeb22dd04f0954322a58c26833506fb4532a9;hpb=3e0753bef36e5efeed700d7277187f6fbd7275f5

diff --git a/src/movepick.h b/src/movepick.h
index bcd5eb14..9e81e218 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -27,7 +27,6 @@
 
 #include "depth.h"
 #include "history.h"
-#include "lock.h"
 #include "position.h"
 
 
@@ -35,7 +34,6 @@
 //// Types
 ////
 
-struct EvalInfo;
 struct SearchStack;
 
 /// MovePicker is a class which is used to pick one legal move at a time from
@@ -51,45 +49,24 @@ class MovePicker {
   MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
 
 public:
-
-  enum MovegenPhase {
-    PH_TT_MOVE,        // Transposition table move
-    PH_MATE_KILLER,    // Mate killer from the current ply
-    PH_GOOD_CAPTURES,  // Queen promotions and captures with SEE values >= 0
-    PH_KILLERS,        // Killer moves from the current ply
-    PH_NONCAPTURES,    // Non-captures and underpromotions
-    PH_BAD_CAPTURES,   // Queen promotions and captures with SEE values < 0
-    PH_EVASIONS,       // Check evasions
-    PH_QCAPTURES,      // Captures in quiescence search
-    PH_QCHECKS,        // Non-capture checks in quiescence search
-    PH_STOP
-  };
-
-  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, Value beta = -VALUE_INFINITE);
   Move get_next_move();
-  Move get_next_move(Lock& lock);
-  int number_of_moves() const;
-  Bitboard discovered_check_candidates() const;
-
-  static void init_phase_table();
+  int number_of_evasions() const;
 
 private:
   void score_captures();
   void score_noncaptures();
-  void score_evasions();
-  void score_qcaptures();
-  Move pick_move_from_list();
+  void score_evasions_or_checks();
+  void go_next_phase();
 
   const Position& pos;
   const History& H;
-  Move ttMove, mateKiller, killer1, killer2;
-  Bitboard pinned, dc;
+  MoveStack ttMoves[2], killers[2];
+  int badCaptureThreshold, phase;
+  const uint8_t* phasePtr;
+  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *lastBadCapture;
+  Bitboard pinned;
   MoveStack moves[256], badCaptures[64];
-  int phaseIndex;
-  int numOfMoves, numOfBadCaptures;
-  int movesPicked;
-  bool checkKillers, checkLegal;
-  bool finished;
 };
 
 
@@ -97,21 +74,14 @@ private:
 //// Inline functions
 ////
 
-/// MovePicker::number_of_moves() simply returns the numOfMoves member
-/// variable. 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.
-
-inline int MovePicker::number_of_moves() const {
-  return numOfMoves;
-}
-
-/// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check. This bitboard is
-/// computed by the constructor function.
+/// 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 Bitboard MovePicker::discovered_check_candidates() const {
-  return dc;
+inline int MovePicker::number_of_evasions() const {
+  return int(lastMove - moves);
 }
 
 #endif // !defined(MOVEPICK_H_INCLUDED)