Rename MOVES_MAX in MAX_MOVES

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 27adb101552160c5fe0613a691f8dce665aff43f..765cae29033de7bb1080a29b6506f6b88925d282 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-2009 Marco Costalba
+  Copyright (C) 2008-2010 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
@@ -17,58 +17,32 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include "depth.h"
 #include "history.h"
-#include "lock.h"
+#include "move.h"
 #include "position.h"
-
-
-////
-//// Types
-////
+#include "types.h"
 
 struct SearchStack;
 
-enum MovegenPhase {
-  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
-/// MovePicker::pick_next_move(), which returns a new legal move each time it
+/// MovePicker::get_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
-/// 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 = NULL);
+  MovePicker(const Position&, Move, Depth, const History&, SearchStack*, Value);
+  MovePicker(const Position&, Move, Depth, const History&);
   Move get_next_move();
-  Move get_next_move(Lock& lock);
-  int number_of_moves() const;
-  Bitboard discovered_check_candidates() const;
 
 private:
   void score_captures();
@@ -78,35 +52,12 @@ private:
 
   const Position& pos;
   const History& H;
+  Bitboard pinned;
   MoveStack ttMoves[2], killers[2];
-  bool finished;
-  int phase;
-  const MovegenPhaseT* phasePtr;
-  MoveStack *curMove, *lastMove, *lastBadCapture;
-  Bitboard dc, pinned;
-  MoveStack moves[256], badCaptures[64];
+  int badCaptureThreshold, phase;
+  const uint8_t* phasePtr;
+  MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures;
+  MoveStack moves[MAX_MOVES];
 };
 
-
-////
-//// 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 int(lastMove - moves);
-}
-
-/// MovePicker::discovered_check_candidates() returns a bitboard containing
-/// all pieces which can possibly give discovered check. This bitboard is
-/// computed by the constructor function.
-
-inline Bitboard MovePicker::discovered_check_candidates() const {
-  return dc;
-}
-
 #endif // !defined(MOVEPICK_H_INCLUDED)