X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=f2f517e219445a601f4d90690572cb1a40e1b288;hp=97166360ff390c101c828e455930fcbd9d59682a;hb=b50921fd5c3e1753adecfea77557ad1afece7641;hpb=2a461b4b745b2542f6e13bab8c60abdb366bc128 diff --git a/src/position.h b/src/position.h index 97166360..f2f517e2 100644 --- a/src/position.h +++ b/src/position.h @@ -88,7 +88,7 @@ enum Phase { struct StateInfo { Key key, pawnKey, materialKey; - int castleRights, rule50; + int castleRights, rule50, pliesFromNull; Square epSquare; Value mgValue, egValue; Value npMaterial[2]; @@ -133,7 +133,7 @@ public: }; // Constructors - Position() {}; + Position() {} Position(const Position& pos); Position(const std::string& fen); @@ -162,26 +162,10 @@ public: Bitboard empty_squares() const; Bitboard occupied_squares() const; Bitboard pieces_of_color(Color c) const; - Bitboard pieces_of_type(PieceType pt) const; - Bitboard pieces_of_color_and_type(Color c, PieceType pt) const; - Bitboard pawns() const; - Bitboard knights() const; - Bitboard bishops() const; - Bitboard rooks() const; - Bitboard queens() const; - Bitboard kings() const; - Bitboard rooks_and_queens() const; - Bitboard bishops_and_queens() const; - Bitboard sliders() const; - Bitboard pawns(Color c) const; - Bitboard knights(Color c) const; - Bitboard bishops(Color c) const; - Bitboard rooks(Color c) const; - Bitboard queens(Color c) const; - Bitboard kings(Color c) const; - Bitboard rooks_and_queens(Color c) const; - Bitboard bishops_and_queens(Color c) const; - Bitboard sliders_of_color(Color c) const; + Bitboard pieces(PieceType pt) const; + Bitboard pieces(PieceType pt, Color c) const; + Bitboard pieces(PieceType pt1, PieceType pt2) const; + Bitboard pieces(PieceType pt1, PieceType pt2, Color c) const; // Number of pieces of each color and type int piece_count(Color c, PieceType pt) const; @@ -199,36 +183,23 @@ public: Square initial_kr_square(Color c) const; Square initial_qr_square(Color c) const; - // Attack bitboards - Bitboard sliding_attacks(Square s, Direction d) const; - Bitboard ray_attacks(Square s, SignedDirection d) const; - Bitboard pawn_attacks(Color c, Square s) const; - - template - Bitboard piece_attacks(Square s) const; - // 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 + // Checking pieces and under check information Bitboard checkers() const; + bool is_check() const; // Piece lists Square piece_list(Color c, PieceType pt, int index) const; + const Square* piece_list_begin(Color c, PieceType pt) const; - // Attack information for a given square - bool square_is_attacked(Square s, Color c) const; - Bitboard attacks_to(Square s) const; - Bitboard attacks_to(Square s, Color c) const; - bool is_check() const; - bool pawn_attacks_square(Color c, Square f, Square t) const; - - template - Bitboard piece_attacks_square(Square f, Square t) const; // Dispatch at compile-time - - bool piece_attacks_square(Piece p, Square f, Square t) const; // Dispatch at run-time + // Information about attacks to or from a given square + Bitboard attackers_to(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; @@ -236,10 +207,8 @@ public: bool move_is_check(Move m) const; bool move_is_check(Move m, Bitboard dcCandidates) const; bool move_is_capture(Move m) const; - bool move_is_deep_pawn_push(Move m) const; - bool move_is_pawn_push_to_7th(Move m) const; + bool move_is_capture_or_promotion(Move m) const; bool move_is_passed_pawn_push(Move m) const; - bool move_was_passed_pawn_push(Move m) const; bool move_attacks_square(Move m, Square s) const; // Information about pawns @@ -248,10 +217,6 @@ public: static bool pawn_is_isolated(Bitboard ourPawns, Square s); static bool pawn_is_doubled(Bitboard ourPawns, Color c, Square s); - // Open and half-open files - static bool file_is_open(Bitboard pawns, File f); - static bool file_is_half_open(Bitboard pawns, File f); - // Weak squares bool square_is_weak(Square s, Color c) const; @@ -301,7 +266,7 @@ public: // Position consistency check, for debugging bool is_ok(int* failedStep = NULL) const; - // Static member functions: + // Static member functions static void init_zobrist(); static void init_piece_square_tables(); @@ -314,13 +279,9 @@ private: void allow_ooo(Color c); // Helper functions for doing and undoing moves - void do_capture_move(PieceType capture, Color them, Square to); + void do_capture_move(Bitboard& key, PieceType capture, Color them, Square to, bool ep); void do_castle_move(Move m); - void do_promotion_move(Move m); - void do_ep_move(Move m); void undo_castle_move(Move m); - void undo_promotion_move(Move m); - void undo_ep_move(Move m); void find_checkers(); template @@ -339,21 +300,20 @@ private: template Value 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] // Piece lists Square pieceList[2][8][16]; // [color][pieceType][index] - int index[64]; + int index[64]; // [square] // Other info - Square kingSquare[2]; Color sideToMove; int gamePly; Key history[MaxGameLength]; @@ -421,80 +381,20 @@ inline Bitboard Position::pieces_of_color(Color c) const { return byColorBB[c]; } -inline Bitboard Position::pieces_of_type(PieceType pt) const { +inline Bitboard Position::pieces(PieceType pt) const { return byTypeBB[pt]; } -inline Bitboard Position::pieces_of_color_and_type(Color c, PieceType pt) const { - return pieces_of_color(c) & pieces_of_type(pt); -} - -inline Bitboard Position::pawns() const { - return pieces_of_type(PAWN); -} - -inline Bitboard Position::knights() const { - return pieces_of_type(KNIGHT); -} - -inline Bitboard Position::bishops() const { - return pieces_of_type(BISHOP); -} - -inline Bitboard Position::rooks() const { - return pieces_of_type(ROOK); -} - -inline Bitboard Position::queens() const { - return pieces_of_type(QUEEN); -} - -inline Bitboard Position::kings() const { - return pieces_of_type(KING); -} - -inline Bitboard Position::rooks_and_queens() const { - return rooks() | queens(); -} - -inline Bitboard Position::bishops_and_queens() const { - return bishops() | queens(); -} - -inline Bitboard Position::sliders() const { - return bishops() | queens() | rooks(); -} - -inline Bitboard Position::pawns(Color c) const { - return pieces_of_color_and_type(c, PAWN); -} - -inline Bitboard Position::knights(Color c) const { - return pieces_of_color_and_type(c, KNIGHT); -} - -inline Bitboard Position::bishops(Color c) const { - return pieces_of_color_and_type(c, BISHOP); -} - -inline Bitboard Position::rooks(Color c) const { - return pieces_of_color_and_type(c, ROOK); -} - -inline Bitboard Position::queens(Color c) const { - return pieces_of_color_and_type(c, QUEEN); +inline Bitboard Position::pieces(PieceType pt, Color c) const { + return byTypeBB[pt] & byColorBB[c]; } -inline Bitboard Position::kings(Color c) const { - return pieces_of_color_and_type(c, KING); +inline Bitboard Position::pieces(PieceType pt1, PieceType pt2) const { + return byTypeBB[pt1] | byTypeBB[pt2]; } -inline Bitboard Position::rooks_and_queens(Color c) const { - return rooks_and_queens() & pieces_of_color(c); -} - -inline Bitboard Position::bishops_and_queens(Color c) const { - return bishops_and_queens() & pieces_of_color(c); +inline Bitboard Position::pieces(PieceType pt1, PieceType pt2, Color c) const { + return (byTypeBB[pt1] | byTypeBB[pt2]) & byColorBB[c]; } inline int Position::piece_count(Color c, PieceType pt) const { @@ -505,12 +405,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 kingSquare[c]; + return pieceList[c][KING][0]; } inline bool Position::can_castle_kingside(Color side) const { @@ -533,33 +437,29 @@ inline Square Position::initial_qr_square(Color c) const { return relative_square(c, make_square(initialQRFile, RANK_1)); } -inline Bitboard Position::pawn_attacks(Color c, Square s) 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(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(Square s) const { - return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s]; -} - -template<> -inline Bitboard Position::piece_attacks(Square s) const { +inline Bitboard Position::attacks_from(Square s) const { return bishop_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks(Square s) const { +inline Bitboard Position::attacks_from(Square s) const { return rook_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks(Square s) const { - return piece_attacks(s) | piece_attacks(s); +inline Bitboard Position::attacks_from(Square s) const { + return attacks_from(s) | attacks_from(s); } inline Bitboard Position::checkers() const { @@ -570,27 +470,8 @@ inline bool Position::is_check() const { return st->checkersBB != EmptyBoardBB; } -inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const { - return bit_is_set(pawn_attacks(c, f), t); -} - -template -Bitboard Position::piece_attacks_square(Square f, Square t) const { - return bit_is_set(piece_attacks(f), t); -} - -inline Bitboard Position::attacks_to(Square s, Color c) const { - - return attacks_to(s) & pieces_of_color(c); -} - -inline bool Position::square_is_attacked(Square s, Color c) const { - - return attacks_to(s, c) != EmptyBoardBB; -} - inline bool Position::pawn_is_passed(Color c, Square s) const { - return !(pawns(opposite_color(c)) & passed_pawn_mask(c, s)); + return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s)); } inline bool Position::pawn_is_passed(Bitboard theirPawns, Color c, Square s) { @@ -605,16 +486,8 @@ inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) { return ourPawns & squares_behind(c, s); } -inline bool Position::file_is_open(Bitboard pawns, File f) { - return !(pawns & file_bb(f)); -} - -inline bool Position::file_is_half_open(Bitboard pawns, File f) { - return !(pawns & file_bb(f)); -} - inline bool Position::square_is_weak(Square s, Color c) const { - return !(pawns(c) & outpost_mask(opposite_color(c), s)); + return !(pieces(PAWN, c) & outpost_mask(opposite_color(c), s)); } inline Key Position::get_key() const { @@ -669,20 +542,6 @@ inline Phase Position::game_phase() const { return Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit)); } -inline bool Position::move_is_deep_pawn_push(Move m) const { - - Color c = side_to_move(); - 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)) == 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(); @@ -690,13 +549,6 @@ inline bool Position::move_is_passed_pawn_push(Move m) const { && 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)) == piece_of_color_and_type(c, PAWN) - && pawn_is_passed(c, move_to(m)); -} - inline int Position::rule_50_counter() const { return st->rule50; @@ -711,14 +563,19 @@ inline bool Position::opposite_colored_bishops() const { inline bool Position::has_pawn_on_7th(Color c) const { - return pawns(c) & relative_rank_bb(c, RANK_7); + return pieces(PAWN, c) & relative_rank_bb(c, RANK_7); } 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)); +} - return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m); +inline bool Position::move_is_capture_or_promotion(Move m) const { + + // 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)