X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=9668368a1bd9e3169f0a90798e838408e4b1fee3;hp=8e2ecf6019b812eb5872e2f7db27d36d65ea2528;hb=05e70d674019e27f2c9a58839f6a9c17e16f9fcc;hpb=2c955f25de9d4c263b6e6d37fef06b378eec49a0 diff --git a/src/position.h b/src/position.h index 8e2ecf60..9668368a 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 Marco Costalba + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,12 +21,16 @@ #if !defined(POSITION_H_INCLUDED) #define POSITION_H_INCLUDED -// Disable a silly and noisy warning from MSVC compiler +// 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 //// @@ -38,7 +42,6 @@ #include "direction.h" #include "move.h" #include "piece.h" -#include "phase.h" #include "square.h" #include "value.h" @@ -47,13 +50,12 @@ //// Constants //// -/// FEN string for the initial position: -const std::string StartPosition = - "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; +/// 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): +/// move counter for every non-reversible move). const int MaxGameLength = 220; @@ -61,56 +63,61 @@ const int MaxGameLength = 220; //// Types //// -/// Castle rights, encoded as bit fields: +/// Castle rights, encoded as bit fields enum CastleRights { - NO_CASTLES = 0, - WHITE_OO = 1, - BLACK_OO = 2, - WHITE_OOO = 4, - BLACK_OOO = 8, + NO_CASTLES = 0, + WHITE_OO = 1, + BLACK_OO = 2, + WHITE_OOO = 4, + BLACK_OOO = 8, 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. -struct UndoInfo { - int castleRights; - Square epSquare; - Bitboard checkersBB; +/// 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 StateInfo { Key key, pawnKey, materialKey; - int rule50; - Move lastMove; + int castleRights, rule50; + Square epSquare; Value mgValue, egValue; + Value npMaterial[2]; + PieceType capture; + Bitboard checkersBB; + StateInfo* previous; }; -/// The position data structure. A position consists of the following data: +/// The position data structure. A position consists of the following data: /// /// * For each piece type, a bitboard representing the squares occupied /// by pieces of that type. -/// * For each color, a bitboard representing the squares occupiecd by +/// * For each color, a bitboard representing the squares occupied by /// pieces of that color. /// * A bitboard of all occupied squares. /// * A bitboard of all checking pieces. /// * A 64-entry array of pieces, indexed by the squares of the board. /// * The current side to move. /// * Information about the castling rights for both sides. -/// * The initial files of the kings and both pairs of rooks. This is +/// * The initial files of the kings and both pairs of rooks. This is /// used to implement the Chess960 castling rules. /// * The en passant square (which is SQ_NONE if no en passant capture is /// possible). /// * The squares of the kings for both sides. -/// * The last move played. /// * Hash keys for the position itself, the current pawn structure, and /// the current material situation. -/// * Hash keys for all previous positions in the game (for detecting +/// * Hash keys for all previous positions in the game for detecting /// repetition draws. /// * A counter for detecting 50 move rule draws. @@ -120,6 +127,11 @@ class Position { friend class EndgameFunctions; public: + enum GamePhase { + MidGame, + EndGame + }; + // Constructors Position() {}; Position(const Position& pos); @@ -131,8 +143,8 @@ public: void print(Move m = MOVE_NONE) const; // Copying - void copy(const Position &pos); - void flipped_copy(const Position &pos); + void copy(const Position& pos); + void flipped_copy(const Position& pos); // The piece on a given square Piece piece_on(Square s) const; @@ -197,6 +209,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 +228,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; @@ -231,29 +244,26 @@ public: // Information about pawns bool pawn_is_passed(Color c, Square s) const; - bool pawn_is_isolated(Color c, Square s) const; - bool pawn_is_doubled(Color c, Square s) const; - - // Open and half-open files - bool file_is_open(File f) const; - bool file_is_half_open(Color c, File f) 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 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 saveState(); + 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; int see(Move m) const; int see(Square to) const; + int see_sign(Move m) const; // Accessing hash keys Key get_key() const; @@ -265,7 +275,7 @@ public: Value eg_value() const; Value non_pawn_material(Color c) const; Phase game_phase() const; - Value mg_pst_delta(Move m) const; + template Value pst_delta(Piece piece, Square from, Square to) const; // Game termination checks bool is_mate() const; @@ -292,6 +302,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); @@ -299,20 +310,16 @@ private: void allow_ooo(Color c); // Helper functions for doing and undoing moves - void do_capture_move(Move m, PieceType capture, Color them, Square to); + void do_capture_move(PieceType capture, Color them, Square to, bool ep); void do_castle_move(Move m); - void do_promotion_move(Move m, UndoInfo &u); - void do_ep_move(Move m); void undo_castle_move(Move m); - void undo_promotion_move(Move m, const UndoInfo &u); - void undo_ep_move(Move m); void find_checkers(); template void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates); - template - Bitboard hidden_checks(Color c, Square ksq) const; + template + Bitboard hidden_checkers(Color c) const; // Computing hash keys from scratch (for initialization and debugging) Key compute_key() const; @@ -320,15 +327,12 @@ 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; + 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]; @@ -341,16 +345,13 @@ private: int index[64]; // Other info + Square kingSquare[2]; Color sideToMove; - int castleRights; + int gamePly; + Key history[MaxGameLength]; File initialKFile, initialKRFile, initialQRFile; - Square epSquare; - Square kingSquare[2]; - Move lastMove; - Key key, pawnKey, materialKey, history[MaxGameLength]; - int rule50, gamePly; - Value mgValue, egValue; - Value npMaterial[2]; + StateInfo startState; + StateInfo* st; // Static variables static int castleRightsMask[64]; @@ -488,10 +489,6 @@ inline Bitboard Position::bishops_and_queens(Color c) const { return bishops_and_queens() & pieces_of_color(c); } -inline Bitboard Position::sliders_of_color(Color c) const { - return sliders() & pieces_of_color(c); -} - inline int Position::piece_count(Color c, PieceType pt) const { return pieceCount[c][pt]; } @@ -501,7 +498,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 { @@ -509,11 +506,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 { @@ -532,14 +529,14 @@ inline Bitboard Position::pawn_attacks(Color c, Square s) const { 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 // Knight and King +inline Bitboard Position::piece_attacks(Square s) const { + return StepAttackBB[Piece][s]; } template<> -inline Bitboard Position::piece_attacks(Square s) const { - return StepAttackBB[KNIGHT][s]; +inline Bitboard Position::piece_attacks(Square s) const { + return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s]; } template<> @@ -557,17 +554,12 @@ inline Bitboard Position::piece_attacks(Square s) const { return piece_attacks(s) | piece_attacks(s); } -template<> -inline Bitboard Position::piece_attacks(Square s) const { - return StepAttackBB[KING][s]; -} - 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 { @@ -593,20 +585,16 @@ inline bool Position::pawn_is_passed(Color c, Square s) const { return !(pawns(opposite_color(c)) & passed_pawn_mask(c, s)); } -inline bool Position::pawn_is_isolated(Color c, Square s) const { - return !(pawns(c) & neighboring_files_bb(s)); -} - -inline bool Position::pawn_is_doubled(Color c, Square s) const { - return pawns(c) & squares_behind(c, s); +inline bool Position::pawn_is_passed(Bitboard theirPawns, Color c, Square s) { + return !(theirPawns & passed_pawn_mask(c, s)); } -inline bool Position::file_is_open(File f) const { - return !(pawns() & file_bb(f)); +inline bool Position::pawn_is_isolated(Bitboard ourPawns, Square s) { + return !(ourPawns & neighboring_files_bb(s)); } -inline bool Position::file_is_half_open(Color c, File f) const { - return !(pawns(c) & file_bb(f)); +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 { @@ -614,53 +602,46 @@ 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; -} - -inline Value Position::mg_pst(Color c, PieceType pt, Square s) const { - return MgPieceSquareTable[piece_of_color_and_type(c, pt)][s]; + return st->materialKey; } -inline Value Position::mg_pst_delta(Move m) const { - return MgPieceSquareTable[piece_on(move_from(m))][move_to(m)] - -MgPieceSquareTable[piece_on(move_from(m))][move_from(m)]; +template +inline Value Position::pst(Color c, PieceType pt, Square s) const { + return (Ph == MidGame ? MgPieceSquareTable[piece_of_color_and_type(c, pt)][s] + : EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]); } -inline Value Position::eg_pst(Color c, PieceType pt, Square s) const { - return EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]; +template +inline Value Position::pst_delta(Piece piece, Square from, Square to) const { + return (Ph == MidGame ? MgPieceSquareTable[piece][to] - MgPieceSquareTable[piece][from] + : EgPieceSquareTable[piece][to] - EgPieceSquareTable[piece][from]); } 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 { - return npMaterial[c]; + return st->npMaterial[c]; } 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(15581); + static const Value EndgameLimit = Value(3998); Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK); @@ -702,7 +683,7 @@ inline bool Position::move_was_passed_pawn_push(Move m) const { inline int Position::rule_50_counter() const { - return rule50; + return st->rule50; } inline bool Position::opposite_colored_bishops() const { @@ -717,5 +698,11 @@ inline bool Position::has_pawn_on_7th(Color c) const { return pawns(c) & relative_rank_bb(c, RANK_7); } +inline bool Position::move_is_capture(Move m) const { + + // Move must not be MOVE_NONE ! + + return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m); +} #endif // !defined(POSITION_H_INCLUDED)