X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=bcbfc850d0c8b15eb4677f63b447996fde6fdeca;hp=e4b6bd0f06123453a006abd6c1be70d67bbbe10c;hb=20621ed3e3588468c44ab2f69a82eedc6f5c0119;hpb=bb3427ca85bdb20b4c8af12b63f635d03c5e9146 diff --git a/src/position.h b/src/position.h index e4b6bd0f..bcbfc850 100644 --- a/src/position.h +++ b/src/position.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,20 +23,21 @@ #include #include "bitboard.h" -#include "move.h" #include "types.h" /// The checkInfo struct is initialized at c'tor time and keeps info used /// to detect if a move gives check. +class Position; struct CheckInfo { - explicit CheckInfo(const Position&); + explicit CheckInfo(const Position&); - Bitboard dcCandidates; - Bitboard pinned; - Bitboard checkSq[8]; + Bitboard dcCandidates; + Bitboard pinned; + Bitboard checkSq[8]; + Square ksq; }; @@ -44,7 +45,6 @@ struct CheckInfo { /// object to its previous state when we retract a move. Whenever a move /// is made on the board (by calling Position::do_move), an StateInfo object /// must be passed as a parameter. -class Position; struct StateInfo { Key pawnKey, materialKey; @@ -101,6 +101,7 @@ public: // The piece on a given square Piece piece_on(Square s) const; + Piece piece_moved(Move m) const; bool square_is_empty(Square s) const; // Side to move @@ -174,24 +175,19 @@ public: int see_sign(Move m) const; // Accessing hash keys - Key get_key() const; - Key get_exclusion_key() const; - Key get_pawn_key() const; - Key get_material_key() const; + Key key() const; + Key exclusion_key() const; + Key pawn_key() const; + Key material_key() const; // Incremental evaluation Score value() const; Value non_pawn_material(Color c) const; Score pst_delta(Piece piece, Square from, Square to) const; - // Game termination checks - bool is_mate() const; + // Other properties of the position template bool is_draw() const; - - // Plies from start position to the beginning of search int startpos_ply_counter() const; - - // Other properties of the position bool opposite_colored_bishops() const; bool has_pawn_on_7th(Color c) const; bool is_chess960() const; @@ -214,7 +210,7 @@ private: // Initialization helper functions (used while setting up a position) void clear(); void put_piece(Piece p, Square s); - void set_castle_right(Square ksq, Square rsq); + void set_castle_right(Color c, Square rsq); bool move_is_legal(const Move m) const; // Helper template functions @@ -278,8 +274,12 @@ inline Piece Position::piece_on(Square s) const { return board[s]; } +inline Piece Position::piece_moved(Move m) const { + return board[from_sq(m)]; +} + inline bool Position::square_is_empty(Square s) const { - return board[s] == PIECE_NONE; + return board[s] == NO_PIECE; } inline Color Position::side_to_move() const { @@ -342,29 +342,17 @@ inline Square Position::castle_rook_square(CastleRight f) const { return castleRookSquare[f]; } -template<> -inline Bitboard Position::attacks_from(Square s, Color c) const { - return StepAttacksBB[make_piece(c, PAWN)][s]; -} - -template // Knight and King and white pawns +template inline Bitboard Position::attacks_from(Square s) const { - return StepAttacksBB[Piece][s]; -} - -template<> -inline Bitboard Position::attacks_from(Square s) const { - return bishop_attacks_bb(s, occupied_squares()); + return Pt == BISHOP ? bishop_attacks_bb(s, occupied_squares()) + : Pt == ROOK ? rook_attacks_bb(s, occupied_squares()) + : Pt == QUEEN ? attacks_from(s) | attacks_from(s) + : StepAttacksBB[Pt][s]; } template<> -inline Bitboard Position::attacks_from(Square s) const { - return rook_attacks_bb(s, occupied_squares()); -} - -template<> -inline Bitboard Position::attacks_from(Square s) const { - return attacks_from(s) | attacks_from(s); +inline Bitboard Position::attacks_from(Square s, Color c) const { + return StepAttacksBB[make_piece(c, PAWN)][s]; } inline Bitboard Position::attacks_from(Piece p, Square s) const { @@ -392,22 +380,22 @@ inline Bitboard Position::pinned_pieces() const { } inline bool Position::pawn_is_passed(Color c, Square s) const { - return !(pieces(PAWN, flip(c)) & passed_pawn_mask(c, s)); + return !(pieces(PAWN, ~c) & passed_pawn_mask(c, s)); } -inline Key Position::get_key() const { +inline Key Position::key() const { return st->key; } -inline Key Position::get_exclusion_key() const { +inline Key Position::exclusion_key() const { return st->key ^ zobExclusion; } -inline Key Position::get_pawn_key() const { +inline Key Position::pawn_key() const { return st->pawnKey; } -inline Key Position::get_material_key() const { +inline Key Position::material_key() const { return st->materialKey; } @@ -429,8 +417,8 @@ inline Value Position::non_pawn_material(Color c) const { inline bool Position::is_passed_pawn_push(Move m) const { - return board[move_from(m)] == make_piece(sideToMove, PAWN) - && pawn_is_passed(sideToMove, move_to(m)); + return board[from_sq(m)] == make_piece(sideToMove, PAWN) + && pawn_is_passed(sideToMove, to_sq(m)); } inline int Position::startpos_ply_counter() const { @@ -455,14 +443,14 @@ inline bool Position::is_chess960() const { inline bool Position::is_capture_or_promotion(Move m) const { assert(is_ok(m)); - return is_special(m) ? !is_castle(m) : !square_is_empty(move_to(m)); + return is_special(m) ? !is_castle(m) : !square_is_empty(to_sq(m)); } inline bool Position::is_capture(Move m) const { // Note that castle is coded as "king captures the rook" assert(is_ok(m)); - return (!square_is_empty(move_to(m)) && !is_castle(m)) || is_enpassant(m); + return (!square_is_empty(to_sq(m)) && !is_castle(m)) || is_enpassant(m); } inline PieceType Position::captured_piece_type() const {