X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=6d7ea0ef30bcd990b98f9d976137d091575f04cb;hp=09c630062dd3984ea5a2fcc0ffaa647c7ff4fe2a;hb=252537fd9c8cb60f765ea390d2464a42adeafc0a;hpb=f35ddb04af2a00bd9facf5b66ec97e4ab28d4480 diff --git a/src/position.h b/src/position.h index 09c63006..6d7ea0ef 100644 --- a/src/position.h +++ b/src/position.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2009 Marco Costalba + Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, 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 @@ -51,7 +51,7 @@ //// /// FEN string for the initial position -const std::string StartPosition = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; +const std::string StartPositionFEN = "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 @@ -63,15 +63,27 @@ const int MaxGameLength = 220; //// Types //// +/// struct checkInfo is initialized at c'tor time and keeps +/// info used to detect if a move gives check. + +struct CheckInfo { + + explicit CheckInfo(const Position&); + + Bitboard dcCandidates; + Bitboard checkSq[8]; + Square ksq; +}; + /// 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 @@ -88,13 +100,13 @@ enum Phase { struct StateInfo { Key pawnKey, materialKey; - int castleRights, rule50, pliesFromNull; + int castleRights, rule50, gamePly, pliesFromNull; Square epSquare; Score value; Value npMaterial[2]; + PieceType capturedType; Key key; - PieceType capture; Bitboard checkersBB; StateInfo* previous; }; @@ -127,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, @@ -134,9 +149,9 @@ public: }; // Constructors - Position() {} - Position(const Position& pos); - 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); @@ -144,7 +159,6 @@ public: void print(Move m = MOVE_NONE) const; // Copying - void copy(const Position& pos); void flipped_copy(const Position& pos); // The piece on a given square @@ -206,25 +220,25 @@ public: bool pl_move_is_legal(Move m, Bitboard pinned) const; bool pl_move_is_evasion(Move m, Bitboard pinned) const; bool move_is_check(Move m) const; - bool move_is_check(Move m, Bitboard dcCandidates) const; + bool move_is_check(Move m, const CheckInfo& ci) const; bool move_is_capture(Move m) const; bool move_is_capture_or_promotion(Move m) const; bool move_is_passed_pawn_push(Move m) const; bool move_attacks_square(Move m, Square s) const; + // Piece captured with previous moves + PieceType captured_piece_type() const; + // Information about pawns bool pawn_is_passed(Color c, Square s) const; - static bool pawn_is_passed(Bitboard theirPawns, Color c, Square s); - static bool pawn_is_isolated(Bitboard ourPawns, Square s); - static bool pawn_is_doubled(Bitboard ourPawns, Color c, Square s); // Weak squares bool square_is_weak(Square s, Color c) const; // Doing and undoing moves - void saveState(); + void detach(); void do_move(Move m, StateInfo& st); - void do_move(Move m, StateInfo& st, Bitboard dcCandidates); + void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck); void undo_move(Move m); void do_null_move(StateInfo& st); void undo_null_move(); @@ -237,32 +251,39 @@ public: // Accessing hash keys Key get_key() const; + Key get_exclusion_key() const; Key get_pawn_key() const; Key get_material_key() const; // Incremental evaluation Score value() const; Value non_pawn_material(Color c) const; - Phase game_phase() 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; + // 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(); + // Position consistency check, for debugging bool is_ok(int* failedStep = NULL) const; @@ -277,16 +298,14 @@ private: void put_piece(Piece p, Square s); void allow_oo(Color c); void allow_ooo(Color c); + bool set_castling_rights(char token); // Helper functions for doing and undoing moves - void do_capture_move(Bitboard& key, PieceType capture, Color them, Square to, bool ep); + void do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep); void do_castle_move(Move m); void undo_castle_move(Move m); void find_checkers(); - template - void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates); - template Bitboard hidden_checkers(Color c) const; @@ -296,7 +315,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; @@ -315,20 +334,21 @@ private: // Other info Color sideToMove; - int gamePly; Key history[MaxGameLength]; - File initialKFile, initialKRFile, initialQRFile; + int castleRightsMask[64]; StateInfo startState; + File initialKFile, initialKRFile, initialQRFile; + int startPosPlyCounter; + int threadID; StateInfo* st; // Static variables - static int castleRightsMask[64]; static Key zobrist[2][8][64]; static Key zobEp[64]; static Key zobCastle[16]; - static Key zobMaterial[2][8][16]; static Key zobSideToMove; static Score PieceSquareTable[16][64]; + static Key zobExclusion; }; @@ -349,7 +369,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 { @@ -400,8 +420,8 @@ inline int Position::piece_count(Color c, PieceType pt) const { return pieceCount[c][pt]; } -inline Square Position::piece_list(Color c, PieceType pt, int index) const { - return pieceList[c][pt][index]; +inline Square Position::piece_list(Color c, PieceType pt, int idx) const { + return pieceList[c][pt][idx]; } inline const Square* Position::piece_list_begin(Color c, PieceType pt) const { @@ -473,26 +493,18 @@ inline bool Position::pawn_is_passed(Color c, Square s) const { return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s)); } -inline bool Position::pawn_is_passed(Bitboard theirPawns, Color c, Square s) { - return !(theirPawns & passed_pawn_mask(c, s)); -} - -inline bool Position::pawn_is_isolated(Bitboard ourPawns, Square s) { - return !(ourPawns & neighboring_files_bb(s)); -} - -inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) { - return ourPawns & squares_behind(c, s); -} - inline bool Position::square_is_weak(Square s, Color c) const { - return !(pieces(PAWN, c) & outpost_mask(opposite_color(c), s)); + return !(pieces(PAWN, opposite_color(c)) & attack_span_mask(c, s)); } inline Key Position::get_key() const { return st->key; } +inline Key Position::get_exclusion_key() const { + return st->key ^ zobExclusion; +} + inline Key Position::get_pawn_key() const { return st->pawnKey; } @@ -501,11 +513,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]; } @@ -517,22 +529,6 @@ inline Value Position::non_pawn_material(Color c) const { return st->npMaterial[c]; } -inline Phase Position::game_phase() const { - - // Values modified by Joona Kiiski - static const Value MidgameLimit = Value(15581); - static const Value EndgameLimit = Value(3998); - - Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK); - - if (npm >= MidgameLimit) - return PHASE_MIDGAME; - else if(npm <= EndgameLimit) - return PHASE_ENDGAME; - else - return Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit)); -} - inline bool Position::move_is_passed_pawn_push(Move m) const { Color c = side_to_move(); @@ -545,11 +541,16 @@ 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 { @@ -569,4 +570,12 @@ 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_type() const { + return st->capturedType; +} + +inline int Position::thread() const { + return threadID; +} + #endif // !defined(POSITION_H_INCLUDED)