X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=b2bfb5d1d167c36efdeedd47c23427d93abe7036;hp=6c73629916a01afdbb24a29f25f1f352f80ca9e3;hb=439aea9ab79373f4520d157ef5feac6cff0ded56;hpb=cf71efc34bc6528a3a980aa0b9eec27770095eb8 diff --git a/src/movepick.h b/src/movepick.h index 6c736299..b2bfb5d1 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" @@ -52,24 +51,21 @@ class MovePicker { public: 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_evasions() const; - Bitboard discovered_check_candidates() const; private: void score_captures(); void score_noncaptures(); - void score_evasions(); + void score_evasions_or_checks(); void go_next_phase(); const Position& pos; const History& H; MoveStack ttMoves[2], killers[2]; - bool finished; int phase; const uint8_t* phasePtr; MoveStack *curMove, *lastMove, *lastBadCapture; - Bitboard dc, pinned; + Bitboard pinned; MoveStack moves[256], badCaptures[64]; }; @@ -88,12 +84,4 @@ inline int MovePicker::number_of_evasions() 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)