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
MovePicker& operator=(const MovePicker&); // silence a warning under MSVC
public:
- MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, bool useNullMove = false);
+ MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL);
Move get_next_move();
Move get_next_move(Lock& lock);
- int number_of_moves() const;
+ int number_of_evasions() const;
Bitboard discovered_check_candidates() const;
private:
const Position& pos;
const History& H;
- Move ttMoves[2], killers[2];
- const MovegenPhaseT* phasePtr;
- int phase, movesPicked, numOfBadCaptures;
+ MoveStack ttMoves[2], killers[2];
bool finished;
+ int phase;
+ const uint8_t* phasePtr;
+ MoveStack *curMove, *lastMove, *lastBadCapture;
Bitboard dc, pinned;
- MoveStack *curMove, *lastMove;
MoveStack moves[256], badCaptures[64];
};
//// 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.
+/// 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 int MovePicker::number_of_moves() const {
+inline int MovePicker::number_of_evasions() const {
return int(lastMove - moves);
}