X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=e5b5f5aa4a85dd7a2aa2c26222d8c6f2822b477b;hp=4b524ec463e0b1be67a460dc9ee64cef04daf6da;hb=a9e55d43262d11a916bdfa68cd1de0174d884cd3;hpb=8365f8ac1ee7f62db18fca8498b3fdb1640674d9 diff --git a/src/position.h b/src/position.h index 4b524ec4..e5b5f5aa 100644 --- a/src/position.h +++ b/src/position.h @@ -38,7 +38,6 @@ #include "direction.h" #include "move.h" #include "piece.h" -#include "phase.h" #include "square.h" #include "value.h" @@ -61,7 +60,7 @@ const int MaxGameLength = 220; //// Types //// -/// Castle rights, encoded as bit fields: +/// Castle rights, encoded as bit fields enum CastleRights { NO_CASTLES = 0, @@ -72,22 +71,28 @@ enum CastleRights { ALL_CASTLES = 15 }; +/// Game phase +enum Phase { + PHASE_ENDGAME = 0, + PHASE_MIDGAME = 128 +}; + -/// The UndoInfo struct stores information we need to restore a Position -/// object to its previous state when we retract a move. Whenever a move -/// is made on the board (by calling Position::do_move), an UndoInfo object -/// must be passed as a parameter. When the move is unmade (by calling -/// Position::undo_move), the same UndoInfo object must be passed again. +/// The StateInfo struct stores information we need to restore a Position +/// object to its previous state when we retract a move. Whenever a move +/// is made on the board (by calling Position::do_move), an StateInfo object +/// must be passed as a parameter. -struct UndoInfo { - int castleRights; +struct StateInfo { + Key key, pawnKey, materialKey; + int castleRights, rule50; Square epSquare; + Value mgValue, egValue; + + PieceType capture; Bitboard checkersBB; - Key key, pawnKey, materialKey; - int rule50; Move lastMove; - PieceType capture; - Value mgValue, egValue; + StateInfo* previous; }; @@ -197,6 +202,7 @@ public: // Bitboards for pinned pieces and discovered check candidates Bitboard discovered_check_candidates(Color c) const; + Bitboard pinned_pieces(Color c, Bitboard& p) const; Bitboard pinned_pieces(Color c) const; // Checking pieces @@ -215,7 +221,7 @@ public: template Bitboard piece_attacks_square(Square f, Square t) const; // Dispatch at compile-time - bool piece_attacks_square(Square f, Square t) const; // Dispatch at run-time + bool piece_attacks_square(Piece p, Square f, Square t) const; // Dispatch at run-time // Properties of moves bool pl_move_is_legal(Move m) const; @@ -242,13 +248,12 @@ public: bool square_is_weak(Square s, Color c) const; // Doing and undoing moves - void backup(UndoInfo &u) const; - void restore(const UndoInfo &u); - void do_move(Move m, UndoInfo &u); - void do_move(Move m, UndoInfo &u, Bitboard dcCandidates); - void undo_move(Move m, const UndoInfo &u); - void do_null_move(UndoInfo &u); - void undo_null_move(const UndoInfo &u); + void setStartState(const StateInfo& st); + void do_move(Move m, StateInfo& st); + void do_move(Move m, StateInfo& st, Bitboard dcCandidates); + void undo_move(Move m); + void do_null_move(StateInfo& st); + void undo_null_move(); // Static exchange evaluation int see(Square from, Square to) const; @@ -292,6 +297,7 @@ public: static void init_piece_square_tables(); private: + // Initialization helper functions (used while setting up a position) void clear(); void put_piece(Piece p, Square s); @@ -301,15 +307,18 @@ private: // Helper functions for doing and undoing moves void do_capture_move(Move m, PieceType capture, Color them, Square to); void do_castle_move(Move m); - void do_promotion_move(Move m, UndoInfo &u); + void do_promotion_move(Move m); void do_ep_move(Move m); void undo_castle_move(Move m); - void undo_promotion_move(Move m, const UndoInfo &u); + void undo_promotion_move(Move m); void undo_ep_move(Move m); void find_checkers(); - template - Bitboard hidden_checks(Color c, Square ksq) const; + template + void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates); + + template + Bitboard hidden_checkers(Color c) const; // Computing hash keys from scratch (for initialization and debugging) Key compute_key() const; @@ -317,15 +326,16 @@ private: Key compute_material_key() const; // Computing incremental evaluation scores and material counts - Value mg_pst(Color c, PieceType pt, Square s) const; - Value eg_pst(Color c, PieceType pt, Square s) const; - Value compute_mg_value() const; - Value compute_eg_value() const; + enum GamePhase { + MidGame, + EndGame + }; + template Value pst(Color c, PieceType pt, Square s) const; + template Value compute_value() const; Value compute_non_pawn_material(Color c) const; // Bitboards Bitboard byColorBB[2], byTypeBB[8]; - Bitboard checkersBB; // Board Piece board[64]; @@ -338,16 +348,14 @@ private: int index[64]; // Other info - Color sideToMove; - int castleRights; - File initialKFile, initialKRFile, initialQRFile; - Square epSquare; Square kingSquare[2]; - Move lastMove; - Key key, pawnKey, materialKey, history[MaxGameLength]; - int rule50, gamePly; - Value mgValue, egValue; + Color sideToMove; + int gamePly; + Key history[MaxGameLength]; Value npMaterial[2]; + File initialKFile, initialKRFile, initialQRFile; + StateInfo startState; + StateInfo* st; // Static variables static int castleRightsMask[64]; @@ -498,7 +506,7 @@ inline Square Position::piece_list(Color c, PieceType pt, int index) const { } inline Square Position::ep_square() const { - return epSquare; + return st->epSquare; } inline Square Position::king_square(Color c) const { @@ -506,11 +514,11 @@ inline Square Position::king_square(Color c) const { } inline bool Position::can_castle_kingside(Color side) const { - return castleRights & (1+int(side)); + return st->castleRights & (1+int(side)); } inline bool Position::can_castle_queenside(Color side) const { - return castleRights & (4+4*int(side)); + return st->castleRights & (4+4*int(side)); } inline bool Position::can_castle(Color side) const { @@ -526,7 +534,12 @@ inline Square Position::initial_qr_square(Color c) const { } inline Bitboard Position::pawn_attacks(Color c, Square s) const { - return StepAttackBB[pawn_of_color(c)][s]; + return StepAttackBB[piece_of_color_and_type(c, PAWN)][s]; +} + +template<> +inline Bitboard Position::piece_attacks(Square s) const { + return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s]; } template<> @@ -555,11 +568,11 @@ inline Bitboard Position::piece_attacks(Square s) const { } inline Bitboard Position::checkers() const { - return checkersBB; + return st->checkersBB; } inline bool Position::is_check() const { - return checkersBB != EmptyBoardBB; + return st->checkersBB != EmptyBoardBB; } inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const { @@ -606,19 +619,21 @@ inline bool Position::square_is_weak(Square s, Color c) const { } inline Key Position::get_key() const { - return key; + return st->key; } inline Key Position::get_pawn_key() const { - return pawnKey; + return st->pawnKey; } inline Key Position::get_material_key() const { - return materialKey; + return st->materialKey; } -inline Value Position::mg_pst(Color c, PieceType pt, Square s) const { - return MgPieceSquareTable[piece_of_color_and_type(c, pt)][s]; +template +inline Value Position::pst(Color c, PieceType pt, Square s) const { + return (Phase == MidGame ? MgPieceSquareTable[piece_of_color_and_type(c, pt)][s] + : EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]); } inline Value Position::mg_pst_delta(Move m) const { @@ -626,16 +641,12 @@ inline Value Position::mg_pst_delta(Move m) const { -MgPieceSquareTable[piece_on(move_from(m))][move_from(m)]; } -inline Value Position::eg_pst(Color c, PieceType pt, Square s) const { - return EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]; -} - inline Value Position::mg_value() const { - return mgValue; + return st->mgValue; } inline Value Position::eg_value() const { - return egValue; + return st->egValue; } inline Value Position::non_pawn_material(Color c) const { @@ -644,15 +655,9 @@ inline Value Position::non_pawn_material(Color c) const { inline Phase Position::game_phase() const { - // The purpose of the Value(325) terms below is to make sure the difference - // between MidgameLimit and EndgameLimit is a power of 2, which should make - // the division at the end of the function a bit faster. - static const Value MidgameLimit = 2 * QueenValueMidgame - + 2 * RookValueMidgame - + 6 * BishopValueMidgame - + Value(325); - - static const Value EndgameLimit = 4 * RookValueMidgame - Value(325); + // Values modified by Joona Kiiski + static const Value MidgameLimit = Value(15713); + static const Value EndgameLimit = Value(4428); Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK); @@ -667,34 +672,34 @@ inline Phase Position::game_phase() const { inline bool Position::move_is_deep_pawn_push(Move m) const { Color c = side_to_move(); - return piece_on(move_from(m)) == pawn_of_color(c) + return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN) && relative_rank(c, move_to(m)) > RANK_4; } inline bool Position::move_is_pawn_push_to_7th(Move m) const { Color c = side_to_move(); - return piece_on(move_from(m)) == pawn_of_color(c) + return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN) && relative_rank(c, move_to(m)) == RANK_7; } inline bool Position::move_is_passed_pawn_push(Move m) const { Color c = side_to_move(); - return piece_on(move_from(m)) == pawn_of_color(c) + return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN) && pawn_is_passed(c, move_to(m)); } inline bool Position::move_was_passed_pawn_push(Move m) const { Color c = opposite_color(side_to_move()); - return piece_on(move_to(m)) == pawn_of_color(c) + return piece_on(move_to(m)) == piece_of_color_and_type(c, PAWN) && pawn_is_passed(c, move_to(m)); } inline int Position::rule_50_counter() const { - return rule50; + return st->rule50; } inline bool Position::opposite_colored_bishops() const {