X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=340cbdb1e9c0a25a0eead1e7945d9dafb9dccc7d;hp=6d7ea0ef30bcd990b98f9d976137d091575f04cb;hb=1e7aaed8bc;hpb=252537fd9c8cb60f765ea390d2464a42adeafc0a diff --git a/src/position.h b/src/position.h index 6d7ea0ef..340cbdb1 100644 --- a/src/position.h +++ b/src/position.h @@ -21,25 +21,12 @@ #if !defined(POSITION_H_INCLUDED) #define POSITION_H_INCLUDED -// Disable some silly and noisy warning from MSVC compiler -#if defined(_MSC_VER) - -// Forcing value to bool 'true' or 'false' (performance warning) -#pragma warning(disable: 4800) - -// Conditional expression is constant -#pragma warning(disable: 4127) - - -#endif - //// //// Includes //// #include "bitboard.h" #include "color.h" -#include "direction.h" #include "move.h" #include "piece.h" #include "square.h" @@ -50,9 +37,6 @@ //// Constants //// -/// FEN string for the initial position -const std::string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1"; - /// Maximum number of plies per game (220 should be enough, because the /// maximum search depth is 100, and during position setup we reset the /// move counter for every non-reversible move). @@ -63,6 +47,8 @@ const int MaxGameLength = 220; //// Types //// +class Position; + /// struct checkInfo is initialized at c'tor time and keeps /// info used to detect if a move gives check. @@ -149,12 +135,11 @@ public: }; // Constructors - explicit Position(int threadID); Position(const Position& pos, int threadID); - Position(const std::string& fen, int threadID); + Position(const std::string& fen, bool isChess960, int threadID); // Text input/output - void from_fen(const std::string& fen); + void from_fen(const std::string& fen, bool isChess960); const std::string to_fen() const; void print(Move m = MOVE_NONE) const; @@ -213,6 +198,7 @@ public: // Information about attacks to or from a given square Bitboard attackers_to(Square s) 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; template Bitboard attacks_from(Square s, Color c) const; @@ -237,6 +223,7 @@ public: // Doing and undoing moves void detach(); + void do_setup_move(Move m, StateInfo& St); void do_move(Move m, StateInfo& st); void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck); void undo_move(Move m); @@ -246,7 +233,6 @@ public: // Static exchange evaluation int see(Square from, Square to) const; int see(Move m) const; - int see(Square to) const; int see_sign(Move m) const; // Accessing hash keys @@ -267,22 +253,19 @@ public: // Check if side to move could be mated in one bool has_mate_threat(); - // Number of plies since the last non-reversible move - int rule_50_counter() const; - + // Number of plies from starting position 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; // Current thread ID searching on the position int thread() const; - // Reset the gamePly variable to 0 - void reset_game_ply(); - - void inc_startpos_ply_counter(); + int64_t nodes_searched() const; + void set_nodes_searched(int64_t n); // Position consistency check, for debugging bool is_ok(int* failedStep = NULL) const; @@ -296,8 +279,8 @@ private: // Initialization helper functions (used while setting up a position) void clear(); void put_piece(Piece p, Square s); - void allow_oo(Color c); - void allow_ooo(Color c); + void do_allow_oo(Color c); + void do_allow_ooo(Color c); bool set_castling_rights(char token); // Helper functions for doing and undoing moves @@ -338,8 +321,10 @@ private: int castleRightsMask[64]; StateInfo startState; File initialKFile, initialKRFile, initialQRFile; + bool isChess960; int startPosPlyCounter; int threadID; + int64_t nodes; StateInfo* st; // Static variables @@ -349,6 +334,9 @@ 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]; }; @@ -356,6 +344,14 @@ private: //// Inline functions //// +inline int64_t Position::nodes_searched() const { + return nodes; +} + +inline void Position::set_nodes_searched(int64_t n) { + nodes = n; +} + inline Piece Position::piece_on(Square s) const { return board[s]; } @@ -377,11 +373,11 @@ inline bool Position::square_is_occupied(Square s) const { } inline Value Position::midgame_value_of_piece_on(Square s) const { - return piece_value_midgame(piece_on(s)); + return PieceValueMidgame[piece_on(s)]; } inline Value Position::endgame_value_of_piece_on(Square s) const { - return piece_value_endgame(piece_on(s)); + return PieceValueEndgame[piece_on(s)]; } inline Color Position::side_to_move() const { @@ -393,7 +389,7 @@ inline Bitboard Position::occupied_squares() const { } inline Bitboard Position::empty_squares() const { - return ~(occupied_squares()); + return ~occupied_squares(); } inline Bitboard Position::pieces_of_color(Color c) const { @@ -458,12 +454,12 @@ inline Square Position::initial_qr_square(Color c) const { template<> inline Bitboard Position::attacks_from(Square s, Color c) const { - return StepAttackBB[piece_of_color_and_type(c, PAWN)][s]; + return NonSlidingAttacksBB[piece_of_color_and_type(c, PAWN)][s]; } template // Knight and King and white pawns inline Bitboard Position::attacks_from(Square s) const { - return StepAttackBB[Piece][s]; + return NonSlidingAttacksBB[Piece][s]; } template<> @@ -536,13 +532,7 @@ inline bool Position::move_is_passed_pawn_push(Move m) const { && pawn_is_passed(c, move_to(m)); } -inline int Position::rule_50_counter() const { - - return st->rule50; -} - inline int Position::startpos_ply_counter() const { - return startPosPlyCounter; } @@ -554,10 +544,13 @@ inline bool Position::opposite_colored_bishops() const { } inline bool Position::has_pawn_on_7th(Color c) const { - return pieces(PAWN, c) & relative_rank_bb(c, RANK_7); } +inline bool Position::is_chess960() const { + return isChess960; +} + inline bool Position::move_is_capture(Move m) const { // Move must not be MOVE_NONE ! @@ -578,4 +571,12 @@ 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)