X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=3a5087c54f5cfa7483abf46a8de52440740b1724;hp=cc816910a3d0320f8e866f12b041dca0d5549ce4;hb=a4988fecee893fcf6a571abc1d2a102afddce591;hpb=6716337f407ad6586b636aca72ee673655822137 diff --git a/src/position.h b/src/position.h index cc816910..3a5087c5 100644 --- a/src/position.h +++ b/src/position.h @@ -100,7 +100,7 @@ enum Phase { struct StateInfo { Key pawnKey, materialKey; - int castleRights, rule50, ply, pliesFromNull; + int castleRights, rule50, gamePly, pliesFromNull; Square epSquare; Score value; Value npMaterial[2]; @@ -139,6 +139,9 @@ class Position { friend class MaterialInfo; friend class EndgameFunctions; + Position(); // No default or copy c'tor allowed + Position(const Position& pos); + public: enum GamePhase { MidGame, @@ -146,9 +149,9 @@ public: }; // Constructors - Position(); - explicit Position(const Position& pos); - explicit Position(const std::string& fen); + explicit Position(int threadID); + Position(const Position& pos, int threadID); + Position(const std::string& fen, int threadID); // Text input/output void from_fen(const std::string& fen); @@ -271,9 +274,11 @@ public: bool opposite_colored_bishops() const; bool has_pawn_on_7th(Color c) const; - // Game ply information - int ply() const; - void reset_ply(); + // Current thread ID searching on the position + int thread() const; + + // Reset the gamePly variable to 0 + void reset_game_ply(); // Position consistency check, for debugging bool is_ok(int* failedStep = NULL) const; @@ -328,6 +333,7 @@ private: int castleRightsMask[64]; StateInfo startState; File initialKFile, initialKRFile, initialQRFile; + int threadID; StateInfo* st; // Static variables @@ -557,8 +563,8 @@ inline PieceType Position::captured_piece() const { return st->capture; } -inline int Position::ply() const { - return st->ply; +inline int Position::thread() const { + return threadID; } #endif // !defined(POSITION_H_INCLUDED)