X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=1c8d0d30fa08a629b4986cbba8708e5a3debe9c1;hp=5fff409259c1cfd8d1544b277c06c85715ede770;hb=2550c6383b4646d64ab431cbb573991353ed7a2e;hpb=eba8925d810fe9c30db18038830d427c655cdd50 diff --git a/src/movepick.h b/src/movepick.h index 5fff4092..1c8d0d30 100644 --- a/src/movepick.h +++ b/src/movepick.h @@ -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,18 +80,17 @@ private: void score_evasions(); void score_qcaptures(); Move pick_move_from_list(); - int find_best_index(); - int find_best_index(Bitboard* squares, int values[]); + int find_best_index() const; const Position& pos; - Move ttMove, mateKiller, killer1, killer2, threatMove; + Move ttMove, mateKiller, killer1, killer2; Bitboard pinned, dc; MoveStack moves[256], badCaptures[64]; bool pvNode; Depth depth; int phaseIndex; int numOfMoves, numOfBadCaptures; - int movesPicked, badCapturesPicked; + int movesPicked; bool finished; }; @@ -105,7 +105,6 @@ private: /// a single reply to check. inline int MovePicker::number_of_moves() const { - return numOfMoves; }