X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=ad76085bd86bbf08fae48ea02044a92a16e85dfb;hp=c656deaf44bc319ac06fd37bdc679d894ab03422;hb=25113861552c9c09ce5dbd5a20510db2fd2e65b0;hpb=9f626725aeb770a38be093a9a47a461053cf7008 diff --git a/src/movepick.h b/src/movepick.h index c656deaf..ad76085b 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -17,23 +17,13 @@ along with this program. If not, see . */ - #if !defined MOVEPICK_H_INCLUDED #define MOVEPICK_H_INCLUDED -//// -//// Includes -//// - #include "depth.h" #include "history.h" #include "position.h" - -//// -//// Types -//// - struct SearchStack; /// MovePicker is a class which is used to pick one legal move at a time from @@ -49,9 +39,9 @@ class MovePicker { MovePicker& operator=(const MovePicker&); // silence a warning under MSVC public: - MovePicker(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss = NULL, Value beta = -VALUE_INFINITE); + 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(); - int number_of_evasions() const; private: void score_captures(); @@ -64,24 +54,9 @@ private: Bitboard pinned; MoveStack ttMoves[2], killers[2]; int badCaptureThreshold, phase; - const int* phasePtr; + const uint8_t* phasePtr; MoveStack *curMove, *lastMove, *lastGoodNonCapture, *badCaptures; MoveStack moves[MOVES_MAX]; }; - -//// -//// Inline functions -//// - -/// 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_evasions() const { - return int(lastMove - moves); -} - #endif // !defined(MOVEPICK_H_INCLUDED)