X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=9e4a6e4c3fba00c9b7b06ebda6687cdc50d01982;hb=e5077dc11e8047eb8ce32a166a73e433a7e19b15;hp=3da25b6f57e4c6e54b8e62af18c84e9717d385ee;hpb=324ca87affc4959f7017e83437fb06b6e770449c;p=stockfish diff --git a/src/position.h b/src/position.h index 3da25b6f..9e4a6e4c 100644 --- a/src/position.h +++ b/src/position.h @@ -20,12 +20,11 @@ #if !defined(POSITION_H_INCLUDED) #define POSITION_H_INCLUDED +#include + #include "bitboard.h" -#include "color.h" #include "move.h" -#include "piece.h" -#include "square.h" -#include "value.h" +#include "types.h" /// Maximum number of plies per game (220 should be enough, because the /// maximum search depth is 100, and during position setup we reset the @@ -42,13 +41,13 @@ struct CheckInfo { explicit CheckInfo(const Position&); Bitboard dcCandidates; + Bitboard pinned; Bitboard checkSq[8]; - Square ksq; }; /// Castle rights, encoded as bit fields -enum CastleRights { +enum CastleRight { CASTLES_NONE = 0, WHITE_OO = 1, BLACK_OO = 2, @@ -107,9 +106,6 @@ struct StateInfo { class Position { - friend class MaterialInfo; - friend class EndgameFunctions; - Position(); // No default or copy c'tor allowed Position(const Position& pos); @@ -129,16 +125,11 @@ public: void print(Move m = MOVE_NONE) const; // Copying - void flipped_copy(const Position& pos); + void flip(); // The piece on a given square Piece piece_on(Square s) const; - PieceType type_of_piece_on(Square s) const; - Color color_of_piece_on(Square s) const; bool square_is_empty(Square s) const; - bool square_is_occupied(Square s) const; - Value midgame_value_of_piece_on(Square s) const; - Value endgame_value_of_piece_on(Square s) const; // Side to move Color side_to_move() const; @@ -146,7 +137,7 @@ public: // Bitboard representation of the position Bitboard empty_squares() const; Bitboard occupied_squares() const; - Bitboard pieces_of_color(Color c) const; + Bitboard pieces(Color c) const; Bitboard pieces(PieceType pt) const; Bitboard pieces(PieceType pt, Color c) const; Bitboard pieces(PieceType pt1, PieceType pt2) const; @@ -162,11 +153,9 @@ public: Square king_square(Color c) const; // Castling rights - bool can_castle_kingside(Color c) const; - bool can_castle_queenside(Color c) const; + bool can_castle(CastleRight f) const; bool can_castle(Color c) const; - Square initial_kr_square(Color c) const; - Square initial_qr_square(Color c) const; + Square castle_rook_square(CastleRight f) const; // Bitboards for pinned pieces and discovered check candidates Bitboard discovered_check_candidates(Color c) const; @@ -174,7 +163,7 @@ public: // Checking pieces and under check information Bitboard checkers() const; - bool is_check() const; + bool in_check() const; // Piece lists Square piece_list(Color c, PieceType pt, int index) const; @@ -182,6 +171,7 @@ public: // Information about attacks to or from a given square Bitboard attackers_to(Square s) const; + Bitboard attackers_to(Square s, Bitboard occ) const; Bitboard attacks_from(Piece p, Square s) const; static Bitboard attacks_from(Piece p, Square s, Bitboard occ); template Bitboard attacks_from(Square s) const; @@ -189,9 +179,8 @@ public: // Properties of moves 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, const CheckInfo& ci) const; + bool move_is_pl(const Move m) const; + bool move_gives_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; @@ -215,7 +204,6 @@ public: void undo_null_move(); // Static exchange evaluation - int see(Square from, Square to) const; int see(Move m) const; int see_sign(Move m) const; @@ -232,13 +220,10 @@ public: // Game termination checks bool is_mate() const; - bool is_draw() const; - - // Check if side to move could be mated in one - bool has_mate_threat(); + template bool is_draw() const; // Number of plies from starting position - int startpos_ply_counter() const; + int full_moves() const; // Other properties of the position bool opposite_colored_bishops() const; @@ -254,9 +239,8 @@ public: // Position consistency check, for debugging bool is_ok(int* failedStep = NULL) const; - // Static member functions - static void init_zobrist(); - static void init_piece_square_tables(); + // Global initialization + static void init(); private: @@ -264,9 +248,9 @@ private: void clear(); void detach(); void put_piece(Piece p, Square s); - void do_allow_oo(Color c); - void do_allow_ooo(Color c); - bool set_castling_rights(char token); + void set_castle(int f, Square ksq, Square rsq); + void set_castling_rights(char token); + bool move_is_pl_slow(const Move m) const; // Helper functions for doing and undoing moves void do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep); @@ -283,7 +267,7 @@ private: Key compute_material_key() const; // Computing incremental evaluation scores and material counts - static Score pst(Color c, PieceType pt, Square s); + static Score pst(Piece p, Square s); Score compute_value() const; Value compute_non_pawn_material(Color c) const; @@ -304,10 +288,10 @@ private: Color sideToMove; Key history[MaxGameLength]; int castleRightsMask[64]; + Square castleRookSquare[16]; // [CastleRights] StateInfo startState; - File initialKFile, initialKRFile, initialQRFile; - bool isChess960; - int startPosPlyCounter; + bool chess960; + int fullMoves; int threadID; int64_t nodes; StateInfo* st; @@ -319,9 +303,6 @@ private: static Key zobSideToMove; static Score PieceSquareTable[16][64]; static Key zobExclusion; - static const Value seeValues[8]; - static const Value PieceValueMidgame[17]; - static const Value PieceValueEndgame[17]; }; inline int64_t Position::nodes_searched() const { @@ -336,30 +317,10 @@ inline Piece Position::piece_on(Square s) const { return board[s]; } -inline Color Position::color_of_piece_on(Square s) const { - return color_of_piece(piece_on(s)); -} - -inline PieceType Position::type_of_piece_on(Square s) const { - return type_of_piece(piece_on(s)); -} - inline bool Position::square_is_empty(Square s) const { return piece_on(s) == PIECE_NONE; } -inline bool Position::square_is_occupied(Square s) const { - return !square_is_empty(s); -} - -inline Value Position::midgame_value_of_piece_on(Square s) const { - return PieceValueMidgame[piece_on(s)]; -} - -inline Value Position::endgame_value_of_piece_on(Square s) const { - return PieceValueEndgame[piece_on(s)]; -} - inline Color Position::side_to_move() const { return sideToMove; } @@ -372,7 +333,7 @@ inline Bitboard Position::empty_squares() const { return ~occupied_squares(); } -inline Bitboard Position::pieces_of_color(Color c) const { +inline Bitboard Position::pieces(Color c) const { return byColorBB[c]; } @@ -412,34 +373,26 @@ inline Square Position::king_square(Color c) const { return pieceList[c][KING][0]; } -inline bool Position::can_castle_kingside(Color side) const { - return st->castleRights & (1+int(side)); +inline bool Position::can_castle(CastleRight f) const { + return st->castleRights & f; } -inline bool Position::can_castle_queenside(Color side) const { - return st->castleRights & (4+4*int(side)); +inline bool Position::can_castle(Color c) const { + return st->castleRights & ((WHITE_OO | WHITE_OOO) << c); } -inline bool Position::can_castle(Color side) const { - return can_castle_kingside(side) || can_castle_queenside(side); -} - -inline Square Position::initial_kr_square(Color c) const { - return relative_square(c, make_square(initialKRFile, RANK_1)); -} - -inline Square Position::initial_qr_square(Color c) const { - return relative_square(c, make_square(initialQRFile, RANK_1)); +inline Square Position::castle_rook_square(CastleRight f) const { + return castleRookSquare[f]; } template<> inline Bitboard Position::attacks_from(Square s, Color c) const { - return NonSlidingAttacksBB[piece_of_color_and_type(c, PAWN)][s]; + return StepAttacksBB[make_piece(c, PAWN)][s]; } template // Knight and King and white pawns inline Bitboard Position::attacks_from(Square s) const { - return NonSlidingAttacksBB[Piece][s]; + return StepAttacksBB[Piece][s]; } template<> @@ -461,7 +414,7 @@ inline Bitboard Position::checkers() const { return st->checkersBB; } -inline bool Position::is_check() const { +inline bool Position::in_check() const { return st->checkersBB != EmptyBoardBB; } @@ -489,8 +442,8 @@ inline Key Position::get_material_key() const { return st->materialKey; } -inline Score Position::pst(Color c, PieceType pt, Square s) { - return PieceSquareTable[piece_of_color_and_type(c, pt)][s]; +inline Score Position::pst(Piece p, Square s) { + return PieceSquareTable[p][s]; } inline Score Position::pst_delta(Piece piece, Square from, Square to) { @@ -508,12 +461,12 @@ inline Value Position::non_pawn_material(Color c) const { inline bool Position::move_is_passed_pawn_push(Move m) const { Color c = side_to_move(); - return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN) + return piece_on(move_from(m)) == make_piece(c, PAWN) && pawn_is_passed(c, move_to(m)); } -inline int Position::startpos_ply_counter() const { - return startPosPlyCounter; +inline int Position::full_moves() const { + return fullMoves; } inline bool Position::opposite_colored_bishops() const { @@ -527,19 +480,21 @@ inline bool Position::has_pawn_on_7th(Color c) const { } inline bool Position::is_chess960() const { - return isChess960; + return chess960; } -inline bool Position::move_is_capture(Move m) const { +inline bool Position::move_is_capture_or_promotion(Move m) const { - // Move must not be MOVE_NONE ! - return (m & (3 << 15)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); + assert(m != MOVE_NONE && m != MOVE_NULL); + return move_is_special(m) ? !move_is_castle(m) : !square_is_empty(move_to(m)); } -inline bool Position::move_is_capture_or_promotion(Move m) const { +inline bool Position::move_is_capture(Move m) const { + + assert(m != MOVE_NONE && m != MOVE_NULL); - // Move must not be MOVE_NONE ! - return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); + // Note that castle is coded as "king captures the rook" + return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m); } inline PieceType Position::captured_piece_type() const { @@ -550,12 +505,4 @@ inline int Position::thread() const { return threadID; } -inline void Position::do_allow_oo(Color c) { - st->castleRights |= (1 + int(c)); -} - -inline void Position::do_allow_ooo(Color c) { - st->castleRights |= (4 + 4*int(c)); -} - #endif // !defined(POSITION_H_INCLUDED)