X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=4514ca4c462cabeb8d14fcb866c42259328fa80c;hp=eecf53527a7e169a33119ba5461a1bd2bebd8228;hb=3ccdb57d6f8a90fbd31cc4cfcd8be59f04c21d64;hpb=dd5a3ae4a6c7cc4adcbb4b72378694b0889139d7 diff --git a/src/position.h b/src/position.h index eecf5352..4514ca4c 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-2009 Marco Costalba + Copyright (C) 2008-2010 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 @@ -70,9 +70,9 @@ struct CheckInfo { CheckInfo(const Position&); - Square ksq; Bitboard dcCandidates; Bitboard checkSq[8]; + Square ksq; }; /// Castle rights, encoded as bit fields @@ -105,8 +105,8 @@ struct StateInfo { Score value; Value npMaterial[2]; - Key key; PieceType capture; + Key key; Bitboard checkersBB; StateInfo* previous; }; @@ -146,9 +146,9 @@ public: }; // Constructors - Position() {} - Position(const Position& pos); - Position(const std::string& fen); + Position(); + explicit Position(const Position& pos); + explicit Position(const std::string& fen); // Text input/output void from_fen(const std::string& fen); @@ -156,7 +156,6 @@ public: void print(Move m = MOVE_NONE) const; // Copying - void copy(const Position& pos); void flipped_copy(const Position& pos); // The piece on a given square @@ -224,19 +223,19 @@ public: bool move_is_passed_pawn_push(Move m) const; bool move_attacks_square(Move m, Square s) const; + // Piece captured with previous moves + PieceType captured_piece() const; + // Information about pawns bool pawn_is_passed(Color c, Square s) const; - static bool pawn_is_passed(Bitboard theirPawns, Color c, Square s); - static bool pawn_is_isolated(Bitboard ourPawns, Square s); - static bool pawn_is_doubled(Bitboard ourPawns, Color c, Square s); // Weak squares bool square_is_weak(Square s, Color c) const; // Doing and undoing moves - void saveState(); + void detach(); void do_move(Move m, StateInfo& st); - void do_move(Move m, StateInfo& st, Bitboard dcCandidates, bool moveCanBeCheck = true); + void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck); void undo_move(Move m); void do_null_move(StateInfo& st); void undo_null_move(); @@ -249,13 +248,13 @@ public: // Accessing hash keys Key get_key() const; + Key get_exclusion_key() const; Key get_pawn_key() const; Key get_material_key() const; // Incremental evaluation Score value() const; Value non_pawn_material(Color c) const; - Phase game_phase() const; Score pst_delta(Piece piece, Square from, Square to) const; // Game termination checks @@ -291,14 +290,11 @@ private: void allow_ooo(Color c); // Helper functions for doing and undoing moves - void do_capture_move(Bitboard& key, PieceType capture, Color them, Square to, bool ep); + void do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep); void do_castle_move(Move m); void undo_castle_move(Move m); void find_checkers(); - template - void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates); - template Bitboard hidden_checkers(Color c) const; @@ -329,18 +325,18 @@ private: Color sideToMove; int gamePly; Key history[MaxGameLength]; - File initialKFile, initialKRFile, initialQRFile; + int castleRightsMask[64]; StateInfo startState; + File initialKFile, initialKRFile, initialQRFile; StateInfo* st; // Static variables - static int castleRightsMask[64]; static Key zobrist[2][8][64]; static Key zobEp[64]; static Key zobCastle[16]; - static Key zobMaterial[2][8][16]; static Key zobSideToMove; static Score PieceSquareTable[16][64]; + static Key zobExclusion; }; @@ -412,8 +408,8 @@ inline int Position::piece_count(Color c, PieceType pt) const { return pieceCount[c][pt]; } -inline Square Position::piece_list(Color c, PieceType pt, int index) const { - return pieceList[c][pt][index]; +inline Square Position::piece_list(Color c, PieceType pt, int idx) const { + return pieceList[c][pt][idx]; } inline const Square* Position::piece_list_begin(Color c, PieceType pt) const { @@ -485,26 +481,18 @@ inline bool Position::pawn_is_passed(Color c, Square s) const { return !(pieces(PAWN, opposite_color(c)) & passed_pawn_mask(c, s)); } -inline bool Position::pawn_is_passed(Bitboard theirPawns, Color c, Square s) { - return !(theirPawns & passed_pawn_mask(c, s)); -} - -inline bool Position::pawn_is_isolated(Bitboard ourPawns, Square s) { - return !(ourPawns & neighboring_files_bb(s)); -} - -inline bool Position::pawn_is_doubled(Bitboard ourPawns, Color c, Square s) { - return ourPawns & squares_behind(c, s); -} - inline bool Position::square_is_weak(Square s, Color c) const { - return !(pieces(PAWN, c) & outpost_mask(opposite_color(c), s)); + return !(pieces(PAWN, opposite_color(c)) & attack_span_mask(c, s)); } inline Key Position::get_key() const { return st->key; } +inline Key Position::get_exclusion_key() const { + return st->key ^ zobExclusion; +} + inline Key Position::get_pawn_key() const { return st->pawnKey; } @@ -529,22 +517,6 @@ inline Value Position::non_pawn_material(Color c) const { return st->npMaterial[c]; } -inline Phase Position::game_phase() const { - - // Values modified by Joona Kiiski - static const Value MidgameLimit = Value(15581); - static const Value EndgameLimit = Value(3998); - - Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK); - - if (npm >= MidgameLimit) - return PHASE_MIDGAME; - else if(npm <= EndgameLimit) - return PHASE_ENDGAME; - else - return Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit)); -} - inline bool Position::move_is_passed_pawn_push(Move m) const { Color c = side_to_move(); @@ -581,4 +553,8 @@ inline bool Position::move_is_capture_or_promotion(Move m) const { return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m)); } +inline PieceType Position::captured_piece() const { + return st->capture; +} + #endif // !defined(POSITION_H_INCLUDED)