X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=5b1bc664be7782f713f1b8641e8aafe9058dc8e4;hp=4514ca4c462cabeb8d14fcb866c42259328fa80c;hb=6080fecf9cba9ac063f8f07bd25004c14016bd33;hpb=3ccdb57d6f8a90fbd31cc4cfcd8be59f04c21d64 diff --git a/src/position.h b/src/position.h index 4514ca4c..5b1bc664 100644 --- a/src/position.h +++ b/src/position.h @@ -21,25 +21,12 @@ #if !defined(POSITION_H_INCLUDED) #define POSITION_H_INCLUDED -// Disable some silly and noisy warning from MSVC compiler -#if defined(_MSC_VER) - -// Forcing value to bool 'true' or 'false' (performance warning) -#pragma warning(disable: 4800) - -// Conditional expression is constant -#pragma warning(disable: 4127) - - -#endif - //// //// Includes //// #include "bitboard.h" #include "color.h" -#include "direction.h" #include "move.h" #include "piece.h" #include "square.h" @@ -50,9 +37,6 @@ //// Constants //// -/// FEN string for the initial position -const std::string StartPosition = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; - /// Maximum number of plies per game (220 should be enough, because the /// maximum search depth is 100, and during position setup we reset the /// move counter for every non-reversible move). @@ -68,7 +52,7 @@ const int MaxGameLength = 220; struct CheckInfo { - CheckInfo(const Position&); + explicit CheckInfo(const Position&); Bitboard dcCandidates; Bitboard checkSq[8]; @@ -78,12 +62,12 @@ struct CheckInfo { /// Castle rights, encoded as bit fields enum CastleRights { - NO_CASTLES = 0, - WHITE_OO = 1, - BLACK_OO = 2, - WHITE_OOO = 4, - BLACK_OOO = 8, - ALL_CASTLES = 15 + CASTLES_NONE = 0, + WHITE_OO = 1, + BLACK_OO = 2, + WHITE_OOO = 4, + BLACK_OOO = 8, + ALL_CASTLES = 15 }; /// Game phase @@ -100,12 +84,12 @@ enum Phase { struct StateInfo { Key pawnKey, materialKey; - int castleRights, rule50, pliesFromNull; + int castleRights, rule50, gamePly, pliesFromNull; Square epSquare; Score value; Value npMaterial[2]; - PieceType capture; + PieceType capturedType; Key key; Bitboard checkersBB; StateInfo* previous; @@ -139,6 +123,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 +133,8 @@ public: }; // Constructors - Position(); - explicit Position(const Position& pos); - explicit Position(const std::string& fen); + Position(const Position& pos, int threadID); + Position(const std::string& fen, int threadID); // Text input/output void from_fen(const std::string& fen); @@ -210,6 +196,7 @@ public: // Information about attacks to or from a given square Bitboard attackers_to(Square s) const; Bitboard attacks_from(Piece p, Square s) const; + static Bitboard attacks_from(Piece p, Square s, Bitboard occ); template Bitboard attacks_from(Square s) const; template Bitboard attacks_from(Square s, Color c) const; @@ -224,7 +211,7 @@ public: bool move_attacks_square(Move m, Square s) const; // Piece captured with previous moves - PieceType captured_piece() const; + PieceType captured_piece_type() const; // Information about pawns bool pawn_is_passed(Color c, Square s) const; @@ -243,7 +230,6 @@ public: // Static exchange evaluation int see(Square from, Square to) const; int see(Move m) const; - int see(Square to) const; int see_sign(Move m) const; // Accessing hash keys @@ -255,24 +241,33 @@ public: // Incremental evaluation Score value() const; Value non_pawn_material(Color c) const; - Score pst_delta(Piece piece, Square from, Square to) const; + static Score pst_delta(Piece piece, Square from, Square to); // Game termination checks bool is_mate() const; bool is_draw() const; - // Check if one side threatens a mate in one - bool has_mate_threat(Color c); + // Check if side to move could be mated in one + bool has_mate_threat(); // Number of plies since the last non-reversible move int rule_50_counter() const; + int startpos_ply_counter() const; + // Other properties of the position bool opposite_colored_bishops() const; bool has_pawn_on_7th(Color c) const; + bool is_chess960() const; + + // Current thread ID searching on the position + int thread() const; // Reset the gamePly variable to 0 void reset_game_ply(); + void inc_startpos_ply_counter(); + int64_t nodes_searched() const; + void set_nodes_searched(int64_t n); // Position consistency check, for debugging bool is_ok(int* failedStep = NULL) const; @@ -286,8 +281,9 @@ private: // Initialization helper functions (used while setting up a position) void clear(); void put_piece(Piece p, Square s); - void allow_oo(Color c); - void allow_ooo(Color c); + void do_allow_oo(Color c); + void do_allow_ooo(Color c); + bool set_castling_rights(char token); // Helper functions for doing and undoing moves void do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep); @@ -304,7 +300,7 @@ private: Key compute_material_key() const; // Computing incremental evaluation scores and material counts - Score pst(Color c, PieceType pt, Square s) const; + static Score pst(Color c, PieceType pt, Square s); Score compute_value() const; Value compute_non_pawn_material(Color c) const; @@ -323,11 +319,14 @@ private: // Other info Color sideToMove; - int gamePly; Key history[MaxGameLength]; int castleRightsMask[64]; StateInfo startState; File initialKFile, initialKRFile, initialQRFile; + bool isChess960; + int startPosPlyCounter; + int threadID; + int64_t nodes; StateInfo* st; // Static variables @@ -337,6 +336,9 @@ private: static Key zobSideToMove; static Score PieceSquareTable[16][64]; static Key zobExclusion; + static const Value seeValues[8]; + static const Value PieceValueMidgame[17]; + static const Value PieceValueEndgame[17]; }; @@ -344,6 +346,14 @@ private: //// Inline functions //// +inline int64_t Position::nodes_searched() const { + return nodes; +} + +inline void Position::set_nodes_searched(int64_t n) { + nodes = n; +} + inline Piece Position::piece_on(Square s) const { return board[s]; } @@ -357,7 +367,7 @@ inline PieceType Position::type_of_piece_on(Square s) const { } inline bool Position::square_is_empty(Square s) const { - return piece_on(s) == EMPTY; + return piece_on(s) == PIECE_NONE; } inline bool Position::square_is_occupied(Square s) const { @@ -365,11 +375,11 @@ inline bool Position::square_is_occupied(Square s) const { } inline Value Position::midgame_value_of_piece_on(Square s) const { - return piece_value_midgame(piece_on(s)); + return PieceValueMidgame[piece_on(s)]; } inline Value Position::endgame_value_of_piece_on(Square s) const { - return piece_value_endgame(piece_on(s)); + return PieceValueEndgame[piece_on(s)]; } inline Color Position::side_to_move() const { @@ -381,7 +391,7 @@ inline Bitboard Position::occupied_squares() const { } inline Bitboard Position::empty_squares() const { - return ~(occupied_squares()); + return ~occupied_squares(); } inline Bitboard Position::pieces_of_color(Color c) const { @@ -501,11 +511,11 @@ inline Key Position::get_material_key() const { return st->materialKey; } -inline Score Position::pst(Color c, PieceType pt, Square s) const { +inline Score Position::pst(Color c, PieceType pt, Square s) { return PieceSquareTable[piece_of_color_and_type(c, pt)][s]; } -inline Score Position::pst_delta(Piece piece, Square from, Square to) const { +inline Score Position::pst_delta(Piece piece, Square from, Square to) { return PieceSquareTable[piece][to] - PieceSquareTable[piece][from]; } @@ -525,22 +535,28 @@ inline bool Position::move_is_passed_pawn_push(Move m) const { } inline int Position::rule_50_counter() const { - return st->rule50; } +inline int Position::startpos_ply_counter() const { + return startPosPlyCounter; +} + inline bool Position::opposite_colored_bishops() const { return piece_count(WHITE, BISHOP) == 1 && piece_count(BLACK, BISHOP) == 1 - && square_color(piece_list(WHITE, BISHOP, 0)) != square_color(piece_list(BLACK, BISHOP, 0)); + && !same_color_squares(piece_list(WHITE, BISHOP, 0), piece_list(BLACK, BISHOP, 0)); } inline bool Position::has_pawn_on_7th(Color c) const { - return pieces(PAWN, c) & relative_rank_bb(c, RANK_7); } +inline bool Position::is_chess960() const { + return isChess960; +} + inline bool Position::move_is_capture(Move m) const { // Move must not be MOVE_NONE ! @@ -553,8 +569,20 @@ inline bool Position::move_is_capture_or_promotion(Move m) const { return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); } -inline PieceType Position::captured_piece() const { - return st->capture; +inline PieceType Position::captured_piece_type() const { + return st->capturedType; +} + +inline int Position::thread() const { + return threadID; +} + +inline void Position::do_allow_oo(Color c) { + st->castleRights |= (1 + int(c)); +} + +inline void Position::do_allow_ooo(Color c) { + st->castleRights |= (4 + 4*int(c)); } #endif // !defined(POSITION_H_INCLUDED)