X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=f77b368abb0cebf74dc7373d9cee8ae55a38d523;hp=7e5aa8660c0e150b4a0d8934220a1aa3535d5902;hb=1ac2f501452ebd9249437b338c98ec398776b71a;hpb=d9e54ceaa1fb38cc16f2b9f68ea45eff85b7c0f5 diff --git a/src/position.h b/src/position.h index 7e5aa866..f77b368a 100644 --- a/src/position.h +++ b/src/position.h @@ -1,13 +1,14 @@ /* - Glaurung, a UCI chess playing engine. - Copyright (C) 2004-2008 Tord Romstad + Stockfish, a UCI chess playing engine derived from Glaurung 2.1 + Copyright (C) 2004-2008 Tord Romstad (Glaurung author) + Copyright (C) 2008 Marco Costalba - Glaurung is free software: you can redistribute it and/or modify + Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - Glaurung is distributed in the hope that it will be useful, + Stockfish is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -171,11 +172,6 @@ public: // Number of pieces of each color and type int piece_count(Color c, PieceType pt) const; - int pawn_count(Color c) const; - int knight_count(Color c) const; - int bishop_count(Color c) const; - int rook_count(Color c) const; - int queen_count(Color c) const; // The en passant square: Square ep_square() const; @@ -194,8 +190,6 @@ public: Bitboard sliding_attacks(Square s, Direction d) const; Bitboard ray_attacks(Square s, SignedDirection d) const; Bitboard pawn_attacks(Color c, Square s) const; - Bitboard white_pawn_attacks(Square s) const; - Bitboard black_pawn_attacks(Square s) const; template Bitboard piece_attacks(Square s) const; @@ -207,27 +201,20 @@ public: // Checking pieces Bitboard checkers() const; - // Piece lists: + // Piece lists Square piece_list(Color c, PieceType pt, int index) const; - Square pawn_list(Color c, int index) const; - Square knight_list(Color c, int index) const; - Square bishop_list(Color c, int index) const; - Square rook_list(Color c, int index) const; - Square queen_list(Color c, int index) 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 piece_attacks_square(Square f, Square t) const; - bool white_pawn_attacks_square(Square f, Square t) const; - bool black_pawn_attacks_square(Square f, Square t) const; - bool knight_attacks_square(Square f, Square t) const; - bool bishop_attacks_square(Square f, Square t) const; - bool rook_attacks_square(Square f, Square t) const; - bool queen_attacks_square(Square f, Square t) const; - bool king_attacks_square(Square f, Square t) 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(Square f, Square t) const; // Dispatch at run-time // Properties of moves bool move_is_legal(Move m) const; @@ -318,6 +305,9 @@ private: void undo_ep_move(Move m); void find_checkers(); + template + Bitboard hidden_checks(Color c, Square ksq) const; + // Computing hash keys from scratch (for initialization and debugging) Key compute_key() const; Key compute_pawn_key() const; @@ -500,50 +490,10 @@ inline int Position::piece_count(Color c, PieceType pt) const { return pieceCount[c][pt]; } -inline int Position::pawn_count(Color c) const { - return piece_count(c, PAWN); -} - -inline int Position::knight_count(Color c) const { - return piece_count(c, KNIGHT); -} - -inline int Position::bishop_count(Color c) const { - return piece_count(c, BISHOP); -} - -inline int Position::rook_count(Color c) const { - return piece_count(c, ROOK); -} - -inline int Position::queen_count(Color c) const { - return piece_count(c, QUEEN); -} - inline Square Position::piece_list(Color c, PieceType pt, int index) const { return pieceList[c][pt][index]; } -inline Square Position::pawn_list(Color c, int index) const { - return piece_list(c, PAWN, index); -} - -inline Square Position::knight_list(Color c, int index) const { - return piece_list(c, KNIGHT, index); -} - -inline Square Position::bishop_list(Color c, int index) const { - return piece_list(c, BISHOP, index); -} - -inline Square Position::rook_list(Color c, int index) const { - return piece_list(c, ROOK, index); -} - -inline Square Position::queen_list(Color c, int index) const { - return piece_list(c, QUEEN, index); -} - inline Square Position::ep_square() const { return epSquare; } @@ -576,14 +526,6 @@ inline Bitboard Position::pawn_attacks(Color c, Square s) const { return StepAttackBB[pawn_of_color(c)][s]; } -inline Bitboard Position::white_pawn_attacks(Square s) const { - return pawn_attacks(WHITE, s); -} - -inline Bitboard Position::black_pawn_attacks(Square s) const { - return pawn_attacks(BLACK, s); -} - template<> inline Bitboard Position::piece_attacks(Square s) const { return StepAttackBB[KNIGHT][s]; @@ -614,35 +556,16 @@ inline Bitboard Position::checkers() const { } inline bool Position::is_check() const { - return checkers() != EmptyBoardBB; -} - -inline bool Position::white_pawn_attacks_square(Square f, Square t) const { - return bit_is_set(white_pawn_attacks(f), t); -} - -inline bool Position::black_pawn_attacks_square(Square f, Square t) const { - return bit_is_set(black_pawn_attacks(f), t); -} - -inline bool Position::knight_attacks_square(Square f, Square t) const { - return bit_is_set(piece_attacks(f), t); -} - -inline bool Position::bishop_attacks_square(Square f, Square t) const { - return bit_is_set(piece_attacks(f), t); -} - -inline bool Position::rook_attacks_square(Square f, Square t) const { - return bit_is_set(piece_attacks(f), t); + return checkersBB != EmptyBoardBB; } -inline bool Position::queen_attacks_square(Square f, Square t) const { - return bit_is_set(piece_attacks(f), t); +inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const { + return bit_is_set(pawn_attacks(c, f), t); } -inline bool Position::king_attacks_square(Square f, Square t) const { - return bit_is_set(piece_attacks(f), t); +template +Bitboard Position::piece_attacks_square(Square f, Square t) const { + return bit_is_set(piece_attacks(f), t); } inline bool Position::pawn_is_passed(Color c, Square s) const { @@ -763,9 +686,9 @@ inline int Position::rule_50_counter() const { inline bool Position::opposite_colored_bishops() const { - return bishop_count(WHITE) == 1 - && bishop_count(BLACK) == 1 - && square_color(bishop_list(WHITE, 0)) != square_color(bishop_list(BLACK, 0)); + return piece_count(WHITE, BISHOP) == 1 + && piece_count(BLACK, BISHOP) == 1 + && square_color(piece_list(WHITE, BISHOP, 0)) != square_color(piece_list(BLACK, BISHOP, 0)); } inline bool Position::has_pawn_on_7th(Color c) const {