X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=56f5546936650d751db0e14f081120ac49b6b9e2;hp=91604e94a81d12f1068c3db6b7a62e54f30fd8f3;hb=b21a5e2f0638a55daeaa98ba95afc6c016ea0b6e;hpb=95212222c7444538b84326208e433ac12f15e9fb diff --git a/src/position.h b/src/position.h index 91604e94..56f55469 100644 --- a/src/position.h +++ b/src/position.h @@ -20,11 +20,11 @@ #if !defined(POSITION_H_INCLUDED) #define POSITION_H_INCLUDED +#include + #include "bitboard.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 @@ -106,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); @@ -128,7 +125,7 @@ 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; @@ -173,7 +170,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; @@ -181,6 +178,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; @@ -188,11 +186,10 @@ 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; + 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; bool move_attacks_square(Move m, Square s) const; @@ -214,9 +211,9 @@ 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; + static int see_value(PieceType pt); // Accessing hash keys Key get_key() const; @@ -231,10 +228,7 @@ 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; @@ -263,9 +257,10 @@ private: void clear(); void detach(); void put_piece(Piece p, Square s); - void do_allow_oo(Color c); - void do_allow_ooo(Color c); + void set_castle_kingside(Color c); + void set_castle_queenside(Color c); bool 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); @@ -305,7 +300,7 @@ private: int castleRightsMask[64]; StateInfo startState; File initialKFile, initialKRFile, initialQRFile; - bool isChess960; + bool chess960; int startPosPlyCounter; int threadID; int64_t nodes; @@ -411,16 +406,24 @@ 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_kingside(Color c) const { + return st->castleRights & (WHITE_OO << c); +} + +inline bool Position::can_castle_queenside(Color c) const { + return st->castleRights & (WHITE_OOO << c); +} + +inline bool Position::can_castle(Color c) const { + return st->castleRights & ((WHITE_OO | WHITE_OOO) << c); } -inline bool Position::can_castle_queenside(Color side) const { - return st->castleRights & (4+4*int(side)); +inline void Position::set_castle_kingside(Color c) { + st->castleRights |= (WHITE_OO << c); } -inline bool Position::can_castle(Color side) const { - return can_castle_kingside(side) || can_castle_queenside(side); +inline void Position::set_castle_queenside(Color c) { + st->castleRights |= (WHITE_OOO << c); } inline Square Position::initial_kr_square(Color c) const { @@ -433,12 +436,12 @@ inline Square Position::initial_qr_square(Color c) const { template<> inline Bitboard Position::attacks_from(Square s, Color c) const { - return NonSlidingAttacksBB[make_piece(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<> @@ -460,7 +463,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; } @@ -472,6 +475,10 @@ inline bool Position::square_is_weak(Square s, Color c) const { return !(pieces(PAWN, opposite_color(c)) & attack_span_mask(c, s)); } +inline int Position::see_value(PieceType pt) { + return seeValues[pt]; +} + inline Key Position::get_key() const { return st->key; } @@ -526,19 +533,13 @@ 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 { - // Move must not be MOVE_NONE ! - return (m & (3 << 15)) ? !move_is_castle(m) : !square_is_empty(move_to(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)); + assert (m != MOVE_NONE && m != MOVE_NULL); + return !move_is_special(m) ? !square_is_empty(move_to(m)) : move_is_ep(m); } inline PieceType Position::captured_piece_type() const { @@ -549,12 +550,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)