X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=8e7f6651620957fe9e6c2978b3cb056b591d1165;hp=fd1ee890f7f8646eb06b6165c6e9645940068a4a;hb=5c81602d14539f8259a715477315e28b5de7cb54;hpb=bac4da70c91bc4ac5def1dd6ae991aca3370299c diff --git a/src/movepick.h b/src/movepick.h index fd1ee890..8e7f6651 100644 --- 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 Marco Costalba + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -47,6 +47,8 @@ struct SearchStack; class MovePicker { + MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC + public: enum MovegenPhase { @@ -63,12 +65,11 @@ public: PH_STOP }; - MovePicker(const Position& p, bool pvnode, Move ttm, const SearchStack& ss, Depth d, EvalInfo* ei = NULL); + 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; int current_move_score() const; - MovegenPhase current_move_type() const; Bitboard discovered_check_candidates() const; static void init_phase_table(); @@ -79,8 +80,6 @@ private: void score_evasions(); 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; @@ -90,7 +89,7 @@ private: Depth depth; int phaseIndex; int numOfMoves, numOfBadCaptures; - int movesPicked, badCapturesPicked; + int movesPicked; bool finished; }; @@ -105,7 +104,6 @@ private: /// a single reply to check. inline int MovePicker::number_of_moves() const { - return numOfMoves; }