X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=676122c23d400efc87db144749d840323f7beb22;hp=4514ca4c462cabeb8d14fcb866c42259328fa80c;hb=a04dcce6289c39ea497de67ab43306ca6d47319b;hpb=3ccdb57d6f8a90fbd31cc4cfcd8be59f04c21d64 diff --git a/src/position.h b/src/position.h index 4514ca4c..676122c2 100644 --- a/src/position.h +++ b/src/position.h @@ -100,7 +100,7 @@ enum Phase { struct StateInfo { Key pawnKey, materialKey; - int castleRights, rule50, pliesFromNull; + int castleRights, rule50, ply, 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,8 +274,10 @@ public: bool opposite_colored_bishops() const; bool has_pawn_on_7th(Color c) const; - // Reset the gamePly variable to 0 - void reset_game_ply(); + // Game ply information + int thread() const; + int ply() const; + void reset_ply(); // Position consistency check, for debugging bool is_ok(int* failedStep = NULL) const; @@ -323,11 +328,11 @@ private: // Other info Color sideToMove; - int gamePly; Key history[MaxGameLength]; int castleRightsMask[64]; StateInfo startState; File initialKFile, initialKRFile, initialQRFile; + int threadID; StateInfo* st; // Static variables @@ -557,4 +562,12 @@ inline PieceType Position::captured_piece() const { return st->capture; } +inline int Position::thread() const { + return threadID; +} + +inline int Position::ply() const { + return st->ply; +} + #endif // !defined(POSITION_H_INCLUDED)