X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=1d6a99bab0f9bfa13314c7a77c7ca6bae4192144;hp=9b5129a9c172fffc4000279abb0f8f7917a3285f;hb=77eec9f9cb50e742151273da6e4cd2847fe9ec1f;hpb=6845397c5cbec26f3a0442091e6a48d356719c3c diff --git a/src/position.h b/src/position.h index 9b5129a9..1d6a99ba 100644 --- a/src/position.h +++ b/src/position.h @@ -63,6 +63,18 @@ 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 { + + CheckInfo(const Position&); + + Square ksq; + Bitboard dcCandidates; + Bitboard checkSq[8]; +}; + /// Castle rights, encoded as bit fields enum CastleRights { @@ -87,12 +99,13 @@ enum Phase { /// must be passed as a parameter. struct StateInfo { - Key key, pawnKey, materialKey; - int castleRights, rule50; - Square kingSquare[2], epSquare; - Value mgValue, egValue; + Key pawnKey, materialKey; + int castleRights, rule50, pliesFromNull; + Square epSquare; + Score value; Value npMaterial[2]; + Key key; PieceType capture; Bitboard checkersBB; StateInfo* previous; @@ -185,7 +198,6 @@ 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 and under check information @@ -194,20 +206,21 @@ public: // Piece lists Square piece_list(Color c, PieceType pt, int index) const; + const Square* piece_list_begin(Color c, PieceType pt) const; // Information about attacks to or from a given square Bitboard attackers_to(Square s) const; - Bitboard attackers_to(Square s, Color c) const; - Bitboard piece_attacks_from(Piece p, Square s) const; - Bitboard pawn_attacks_from(Square s, Color c) const; - template Bitboard piece_attacks_from(Square s) const; + Bitboard attacks_from(Piece p, Square s) const; + template Bitboard attacks_from(Square s) const; + template Bitboard attacks_from(Square s, Color c) const; // Properties of moves - bool pl_move_is_legal(Move m) const; 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; @@ -223,7 +236,7 @@ public: // Doing and undoing moves void saveState(); 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(); @@ -240,11 +253,9 @@ public: Key get_material_key() const; // Incremental evaluation - Value mg_value() const; - Value eg_value() const; + Score value() const; Value non_pawn_material(Color c) const; - Phase game_phase() const; - template Value pst_delta(Piece piece, Square from, Square to) const; + Score pst_delta(Piece piece, Square from, Square to) const; // Game termination checks bool is_mate() const; @@ -270,6 +281,9 @@ public: static void init_zobrist(); static void init_piece_square_tables(); + // Public zobs + static Key zobExclusion; + private: // Initialization helper functions (used while setting up a position) @@ -284,9 +298,6 @@ private: 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,16 +307,16 @@ private: Key compute_material_key() const; // Computing incremental evaluation scores and material counts - template Value pst(Color c, PieceType pt, Square s) const; - template Value compute_value() const; + Score pst(Color c, PieceType pt, Square s) const; + Score compute_value() const; Value compute_non_pawn_material(Color c) const; - // Bitboards - Bitboard byColorBB[2], byTypeBB[8]; - // Board Piece board[64]; + // Bitboards + Bitboard byTypeBB[8], byColorBB[2]; + // Piece counts int pieceCount[2][8]; // [color][pieceType] @@ -328,8 +339,7 @@ private: static Key zobCastle[16]; static Key zobMaterial[2][8][16]; static Key zobSideToMove; - static Value MgPieceSquareTable[16][64]; - static Value EgPieceSquareTable[16][64]; + static Score PieceSquareTable[16][64]; }; @@ -405,12 +415,16 @@ inline Square Position::piece_list(Color c, PieceType pt, int index) const { return pieceList[c][pt][index]; } +inline const Square* Position::piece_list_begin(Color c, PieceType pt) const { + return pieceList[c][pt]; +} + inline Square Position::ep_square() const { return st->epSquare; } inline Square Position::king_square(Color c) const { - return st->kingSquare[c]; + return pieceList[c][KING][0]; } inline bool Position::can_castle_kingside(Color side) const { @@ -433,33 +447,29 @@ inline Square Position::initial_qr_square(Color c) const { return relative_square(c, make_square(initialQRFile, RANK_1)); } -inline Bitboard Position::pawn_attacks_from(Square s, Color c) const { +template<> +inline Bitboard Position::attacks_from(Square s, Color c) const { return StepAttackBB[piece_of_color_and_type(c, PAWN)][s]; } -template // Knight and King -inline Bitboard Position::piece_attacks_from(Square s) const { +template // Knight and King and white pawns +inline Bitboard Position::attacks_from(Square s) const { return StepAttackBB[Piece][s]; } template<> -inline Bitboard Position::piece_attacks_from(Square s) const { - return StepAttackBB[WP][s] | StepAttackBB[BP][s]; -} - -template<> -inline Bitboard Position::piece_attacks_from(Square s) const { +inline Bitboard Position::attacks_from(Square s) const { return bishop_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks_from(Square s) const { +inline Bitboard Position::attacks_from(Square s) const { return rook_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks_from(Square s) const { - return piece_attacks_from(s) | piece_attacks_from(s); +inline Bitboard Position::attacks_from(Square s) const { + return attacks_from(s) | attacks_from(s); } inline Bitboard Position::checkers() const { @@ -470,11 +480,6 @@ inline bool Position::is_check() const { return st->checkersBB != EmptyBoardBB; } -inline Bitboard Position::attackers_to(Square s, Color c) const { - - return attackers_to(s) & pieces_of_color(c); -} - inline bool Position::pawn_is_passed(Color c, Square s) const { return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s)); } @@ -507,46 +512,22 @@ inline Key Position::get_material_key() const { return st->materialKey; } -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]); -} - -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 Score Position::pst(Color c, PieceType pt, Square s) const { + return PieceSquareTable[piece_of_color_and_type(c, pt)][s]; } -inline Value Position::mg_value() const { - return st->mgValue; +inline Score Position::pst_delta(Piece piece, Square from, Square to) const { + return PieceSquareTable[piece][to] - PieceSquareTable[piece][from]; } -inline Value Position::eg_value() const { - return st->egValue; +inline Score Position::value() const { + return st->value; } 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(); @@ -574,8 +555,13 @@ inline bool Position::has_pawn_on_7th(Color c) const { inline bool Position::move_is_capture(Move m) const { // Move must not be MOVE_NONE ! + return (m & (3 << 15)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); +} + +inline bool Position::move_is_capture_or_promotion(Move m) const { - return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m); + // Move must not be MOVE_NONE ! + return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); } #endif // !defined(POSITION_H_INCLUDED)