X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=c2619be8baa03602703155e79bb0911dadc16a5c;hp=5a38826188811eb634f053d5cd3396760325d69f;hb=5a0581498cde3d0904924d8ef7ed25ea1a2c855a;hpb=74fd57220e4e5a214761adc2d12335a12bef56f3 diff --git a/src/movepick.h b/src/movepick.h index 5a388261..c2619be8 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -34,6 +34,9 @@ //// Types //// +struct EvalInfo; +struct SearchStack; + /// 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 @@ -60,7 +63,7 @@ public: PH_STOP }; - MovePicker(const Position& p, bool pvnode, Move ttm, Move mk, Move k1, Move k2, Depth d); + MovePicker(const Position& p, bool pvnode, Move ttm, const SearchStack& ss, Depth d); Move get_next_move(); Move get_next_move(Lock &lock); int number_of_moves() const; @@ -77,6 +80,7 @@ private: void score_qcaptures(); Move pick_move_from_list(); int find_best_index(); + int find_best_index(Bitboard* squares, int values[]); const Position& pos; Move ttMove, mateKiller, killer1, killer2; @@ -86,7 +90,7 @@ private: Depth depth; int phaseIndex; int numOfMoves, numOfBadCaptures; - int movesPicked, badCapturesPicked; + int movesPicked; bool finished; }; @@ -101,7 +105,6 @@ private: /// a single reply to check. inline int MovePicker::number_of_moves() const { - return numOfMoves; }