X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=11cdc132e97621c6e25a422d2818468a1564da94;hp=e48be111ec7dca3d7e055c0b892f6ec9f31e7fb6;hb=6709b01903b9122cf619e8469a0bea96097447e7;hpb=23ceb6695073cef741253ab175fabfde48415463 diff --git a/src/position.h b/src/position.h index e48be111..11cdc132 100644 --- a/src/position.h +++ b/src/position.h @@ -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; @@ -236,10 +220,7 @@ 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_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 @@ -310,13 +291,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 @@ -346,7 +323,7 @@ private: // Piece lists Square pieceList[2][8][16]; // [color][pieceType][index] - int index[64]; + int index[64]; // [square] // Other info Square kingSquare[2]; @@ -417,80 +394,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::pieces(PieceType pt, Color c) const { + return byTypeBB[pt] & byColorBB[c]; } -inline Bitboard Position::pawns() const { - return pieces_of_type(PAWN); +inline Bitboard Position::pieces(PieceType pt1, PieceType pt2) const { + return byTypeBB[pt1] | byTypeBB[pt2]; } -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::kings(Color c) const { - return pieces_of_color_and_type(c, KING); -} - -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 { @@ -540,7 +457,7 @@ inline Bitboard Position::piece_attacks(Square s) const { template<> inline Bitboard Position::piece_attacks(Square s) const { - return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s]; + return StepAttackBB[WP][s] | StepAttackBB[BP][s]; } template<> @@ -571,7 +488,7 @@ inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const { } template -Bitboard Position::piece_attacks_square(Square f, Square t) const { +inline Bitboard Position::piece_attacks_square(Square f, Square t) const { return bit_is_set(piece_attacks(f), t); } @@ -586,7 +503,7 @@ inline bool Position::square_is_attacked(Square s, Color c) const { } 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) { @@ -602,7 +519,7 @@ inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) { } 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 { @@ -657,20 +574,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(); @@ -678,13 +581,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; @@ -699,7 +595,7 @@ 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 {