X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=09c630062dd3984ea5a2fcc0ffaa647c7ff4fe2a;hp=c9088438a23f9bc7be5561a6f17ae5f258109dd5;hb=f35ddb04af2a00bd9facf5b66ec97e4ab28d4480;hpb=dd80b9abaf8aa880c5aa2db10066d4c81e8d7205 diff --git a/src/position.h b/src/position.h index c9088438..09c63006 100644 --- a/src/position.h +++ b/src/position.h @@ -87,12 +87,13 @@ enum Phase { /// must be passed as a parameter. struct StateInfo { - Key key, pawnKey, materialKey; - int castleRights, rule50; - Square kingSquare[2], epSquare; - Value mgValue, egValue; + Key pawnKey, materialKey; + int castleRights, rule50, pliesFromNull; + Square epSquare; + Score value; Value npMaterial[2]; + Key key; PieceType capture; Bitboard checkersBB; StateInfo* previous; @@ -193,19 +194,21 @@ public: // Piece lists Square piece_list(Color c, PieceType pt, int index) const; + const Square* piece_list_begin(Color c, PieceType pt) const; // Information about attacks to or from a given square Bitboard attackers_to(Square s) const; - Bitboard piece_attacks_from(Piece p, Square s) const; - Bitboard pawn_attacks_from(Square s, Color c) const; - template Bitboard piece_attacks_from(Square s) const; + Bitboard attacks_from(Piece p, Square s) const; + template Bitboard attacks_from(Square s) const; + template Bitboard attacks_from(Square s, Color c) const; // Properties of moves - bool pl_move_is_legal(Move m) const; 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, Bitboard dcCandidates) 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; @@ -238,11 +241,10 @@ public: Key get_material_key() const; // Incremental evaluation - Value mg_value() const; - Value eg_value() const; + Score value() const; Value non_pawn_material(Color c) const; Phase game_phase() const; - template Value pst_delta(Piece piece, Square from, Square to) const; + Score pst_delta(Piece piece, Square from, Square to) const; // Game termination checks bool is_mate() const; @@ -294,16 +296,16 @@ private: Key compute_material_key() const; // Computing incremental evaluation scores and material counts - template Value pst(Color c, PieceType pt, Square s) const; - template Value compute_value() const; + Score pst(Color c, PieceType pt, Square s) const; + Score compute_value() const; Value compute_non_pawn_material(Color c) const; - // Bitboards - Bitboard byColorBB[2], byTypeBB[8]; - // Board Piece board[64]; + // Bitboards + Bitboard byTypeBB[8], byColorBB[2]; + // Piece counts int pieceCount[2][8]; // [color][pieceType] @@ -326,8 +328,7 @@ private: static Key zobCastle[16]; static Key zobMaterial[2][8][16]; static Key zobSideToMove; - static Value MgPieceSquareTable[16][64]; - static Value EgPieceSquareTable[16][64]; + static Score PieceSquareTable[16][64]; }; @@ -403,12 +404,16 @@ inline Square Position::piece_list(Color c, PieceType pt, int index) const { return pieceList[c][pt][index]; } +inline const Square* Position::piece_list_begin(Color c, PieceType pt) const { + return pieceList[c][pt]; +} + inline Square Position::ep_square() const { return st->epSquare; } inline Square Position::king_square(Color c) const { - return st->kingSquare[c]; + return pieceList[c][KING][0]; } inline bool Position::can_castle_kingside(Color side) const { @@ -431,33 +436,29 @@ inline Square Position::initial_qr_square(Color c) const { return relative_square(c, make_square(initialQRFile, RANK_1)); } -inline Bitboard Position::pawn_attacks_from(Square s, Color c) const { +template<> +inline Bitboard Position::attacks_from(Square s, Color c) const { return StepAttackBB[piece_of_color_and_type(c, PAWN)][s]; } -template // Knight and King -inline Bitboard Position::piece_attacks_from(Square s) const { +template // Knight and King and white pawns +inline Bitboard Position::attacks_from(Square s) const { return StepAttackBB[Piece][s]; } template<> -inline Bitboard Position::piece_attacks_from(Square s) const { - return StepAttackBB[WP][s] | StepAttackBB[BP][s]; -} - -template<> -inline Bitboard Position::piece_attacks_from(Square s) const { +inline Bitboard Position::attacks_from(Square s) const { return bishop_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks_from(Square s) const { +inline Bitboard Position::attacks_from(Square s) const { return rook_attacks_bb(s, occupied_squares()); } template<> -inline Bitboard Position::piece_attacks_from(Square s) const { - return piece_attacks_from(s) | piece_attacks_from(s); +inline Bitboard Position::attacks_from(Square s) const { + return attacks_from(s) | attacks_from(s); } inline Bitboard Position::checkers() const { @@ -500,24 +501,16 @@ inline Key Position::get_material_key() const { return st->materialKey; } -template -inline Value Position::pst(Color c, PieceType pt, Square s) const { - return (Ph == MidGame ? MgPieceSquareTable[piece_of_color_and_type(c, pt)][s] - : EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]); -} - -template -inline Value Position::pst_delta(Piece piece, Square from, Square to) const { - return (Ph == MidGame ? MgPieceSquareTable[piece][to] - MgPieceSquareTable[piece][from] - : EgPieceSquareTable[piece][to] - EgPieceSquareTable[piece][from]); +inline Score Position::pst(Color c, PieceType pt, Square s) const { + return PieceSquareTable[piece_of_color_and_type(c, pt)][s]; } -inline Value Position::mg_value() const { - return st->mgValue; +inline Score Position::pst_delta(Piece piece, Square from, Square to) const { + return PieceSquareTable[piece][to] - PieceSquareTable[piece][from]; } -inline Value Position::eg_value() const { - return st->egValue; +inline Score Position::value() const { + return st->value; } inline Value Position::non_pawn_material(Color c) const { @@ -567,8 +560,13 @@ inline bool Position::has_pawn_on_7th(Color c) const { 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 { - return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m); + // Move must not be MOVE_NONE ! + return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); } #endif // !defined(POSITION_H_INCLUDED)