X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=34e2f7eef16d0fdb9df11f043087801f3b33aa3d;hp=8342df3c1efa067dea1f688fdb42d719d33c68f6;hb=2e21aba8d937bdf5eb0eedeac99ac2c2553e9d0d;hpb=fa1e3427bdf7f6347326015a381014564e8fb337 diff --git a/src/position.h b/src/position.h index 8342df3c..34e2f7ee 100644 --- a/src/position.h +++ b/src/position.h @@ -2,7 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -56,7 +56,10 @@ struct StateInfo { Bitboard checkSquares[PIECE_TYPE_NB]; }; -// In a std::deque references to elements are unaffected upon resizing +/// A list to keep track of the position states along the setup moves (from the +/// start position to the position just before the search starts). Needed by +/// 'draw by repetition' detection. Use a std::deque because pointers to +/// elements are not invalidated upon list resizing. typedef std::unique_ptr> StateListPtr; @@ -134,8 +137,6 @@ public: void undo_move(Move m); void do_null_move(StateInfo& newSt); void undo_null_move(); - void increment_nodes(); - void increment_tbHits(); // Static Exchange Evaluation bool see_ge(Move m, Value threshold = VALUE_ZERO) const; @@ -148,12 +149,9 @@ public: // Other properties of the position Color side_to_move() const; - Phase game_phase() const; int game_ply() const; bool is_chess960() const; Thread* this_thread() const; - uint64_t nodes_searched() const; - uint64_t tb_hits() const; bool is_draw(int ply) const; int rule50_count() const; Score psq_score() const; @@ -187,8 +185,6 @@ private: int castlingRightsMask[SQUARE_NB]; Square castlingRookSquare[CASTLING_RIGHT_NB]; Bitboard castlingPath[CASTLING_RIGHT_NB]; - uint64_t nodes; - uint64_t tbHits; int gamePly; Color sideToMove; Thread* thisThread; @@ -353,22 +349,6 @@ inline int Position::rule50_count() const { return st->rule50; } -inline uint64_t Position::nodes_searched() const { - return nodes; -} - -inline void Position::increment_nodes() { - nodes++; -} - -inline uint64_t Position::tb_hits() const { - return tbHits; -} - -inline void Position::increment_tbHits() { - tbHits++; -} - inline bool Position::opposite_bishops() const { return pieceCount[W_BISHOP] == 1 && pieceCount[B_BISHOP] == 1