Convert handling of tt moves and killers to standard form

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index c7b1ddaf58be40533e6e170b8ca6ef1e047b4801..b31d9dd2d48dafbdc3fc1f985e58189f645f5404 100644 (file)
--- 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 Marco Costalba
+  Copyright (C) 2008-2009 Marco Costalba
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 ////
 
 #include "depth.h"
+#include "history.h"
 #include "lock.h"
 #include "position.h"
 
@@ -34,9 +35,26 @@
 //// Types
 ////
 
+struct SearchStack;
+
+enum MovegenPhase {
+  PH_NULL_MOVE,      // Null move
+  PH_TT_MOVES,       // Transposition table move and mate killer
+  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
+};
+
+typedef uint8_t MovegenPhaseT;
+
 /// 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
-/// moves we have reason to believe are good.  The most important method is
+/// 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.
 /// In order to improve the efficiency of the alpha beta algorithm, MovePicker
@@ -44,53 +62,30 @@
 
 class MovePicker {
 
-public:
+  MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
 
-  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_BAD_CAPTURES,   // Queen promotions and captures with SEE values < 0
-    PH_KILLER_1,       // Killer move 1 from the current ply (not used yet).
-    PH_KILLER_2,       // Killer move 2 from the current ply (not used yet).
-    PH_NONCAPTURES,    // Non-captures and underpromotions
-    PH_EVASIONS,       // Check evasions
-    PH_QCAPTURES,      // Captures in quiescence search
-    PH_QCHECKS,        // Checks in quiescence search
-    PH_STOP
-  };
-
-  MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, Depth d);
+public:
+  MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, bool useNullMove = false);
   Move get_next_move();
-  Move get_next_move(Lock &lock);
+  Move get_next_move(Lock& lock);
   int number_of_moves() const;
-  int current_move_score() const;
-  MovegenPhase current_move_type() const;
   Bitboard discovered_check_candidates() const;
 
-  static void init_phase_table();
-
 private:
   void score_captures();
   void score_noncaptures();
   void score_evasions();
-  void score_qcaptures();
-  Move pick_move_from_list();
-  int find_best_index();
-  int MovePicker::find_best_index(Bitboard* squares, int values[]);
+  void go_next_phase();
 
   const Position& pos;
-  Move ttMove, mateKiller, killer1, killer2;
-  Bitboard pinned, dc;
-  MoveStack moves[256], badCaptures[64];
-  Bitboard capSquares;\r
-  int capSqValues[64];
-  bool pvNode;
-  Depth depth;
-  int phaseIndex;
-  int numOfMoves, numOfBadCaptures;
-  int movesPicked, badCapturesPicked;
+  const History& H;
+  MoveStack ttMoves[2], killers[2];
   bool finished;
+  int numOfBadCaptures, phase;
+  const MovegenPhaseT* phasePtr;
+  MoveStack *curMove, *lastMove;
+  Bitboard dc, pinned;
+  MoveStack moves[256], badCaptures[64];
 };
 
 
@@ -104,12 +99,11 @@ private:
 /// a single reply to check.
 
 inline int MovePicker::number_of_moves() const {
-
-  return numOfMoves;
+  return int(lastMove - moves);
 }
 
 /// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check.  This bitboard is
+/// all pieces which can possibly give discovered check. This bitboard is
 /// computed by the constructor function.
 
 inline Bitboard MovePicker::discovered_check_candidates() const {