X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=1070236be818ffbad0e07e214f5aa443ef2c3234;hp=72932f778e9c07af6bcb9ce89e2822a8b78ddc61;hb=8de29390f2d2bd31585b93ff46eae3051126f666;hpb=74829342efcb93a6f581f69e293a02d3e2cfc507 diff --git a/src/position.h b/src/position.h index 72932f77..1070236b 100644 --- a/src/position.h +++ b/src/position.h @@ -1,7 +1,8 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -21,16 +22,24 @@ #define POSITION_H_INCLUDED #include -#include +#include // For offsetof() +#include #include "bitboard.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 Thread; +class Thread; + +namespace PSQT { + + extern Score psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB]; + + void init(); +} + +/// CheckInfo struct is initialized at constructor time and keeps info used to +/// detect if a move gives check. struct CheckInfo { @@ -38,52 +47,54 @@ struct CheckInfo { Bitboard dcCandidates; Bitboard pinned; - Bitboard checkSq[PIECE_TYPE_NB]; - Square ksq; + Bitboard checkSquares[PIECE_TYPE_NB]; + Square ksq; }; -/// The StateInfo struct stores information needed to restore a Position -/// object to its previous state when we retract a move. Whenever a move -/// is made on the board (by calling Position::do_move), a StateInfo -/// object must be passed as a parameter. +/// StateInfo struct stores information needed to restore a Position object to +/// its previous state when we retract a move. Whenever a move is made on the +/// board (by calling Position::do_move), a StateInfo object must be passed. struct StateInfo { - Key pawnKey, materialKey; - Value npMaterial[COLOR_NB]; - int castlingRights, rule50, pliesFromNull; - Score psq; + + // Copied when making a move + Key pawnKey; + Key materialKey; + Value nonPawnMaterial[COLOR_NB]; + int castlingRights; + int rule50; + int pliesFromNull; + Score psq; Square epSquare; - Key key; - Bitboard checkersBB; - PieceType capturedType; + // Not copied when making a move + Key key; + Bitboard checkersBB; + PieceType capturedType; StateInfo* previous; }; -/// When making a move the current StateInfo up to 'key' excluded is copied to -/// the new one. Here we calculate the quad words (64bits) needed to be copied. -const size_t StateCopySize64 = offsetof(StateInfo, key) / sizeof(uint64_t) + 1; - - -/// The Position class stores the information regarding the board representation -/// like pieces, side to move, hash keys, castling info, etc. The most important -/// methods are do_move() and undo_move(), used by the search to update node info -/// when traversing the search tree. +/// Position class stores information regarding the board representation as +/// pieces, side to move, hash keys, castling info, etc. Important methods are +/// do_move() and undo_move(), used by the search to update node info when +/// traversing the search tree. class Position { + public: - Position() {} - Position(const Position& pos, Thread* t) { *this = pos; thisThread = t; } - Position(const std::string& f, bool c960, Thread* t) { set(f, c960, t); } - Position& operator=(const Position&); static void init(); - // Text input/output + Position() = default; // To define the global object RootPos + Position(const Position&) = delete; + Position(const Position& pos, Thread* th) { *this = pos; thisThread = th; } + Position(const std::string& f, bool c960, Thread* th) { set(f, c960, th); } + Position& operator=(const Position&); // To assign RootPos from UCI + + // FEN string input/output void set(const std::string& fenStr, bool isChess960, Thread* th); const std::string fen() const; - const std::string pretty() const; // Position representation Bitboard pieces() const; @@ -93,11 +104,11 @@ public: Bitboard pieces(Color c, PieceType pt) const; Bitboard pieces(Color c, PieceType pt1, PieceType pt2) const; Piece piece_on(Square s) const; - Square king_square(Color c) const; Square ep_square() const; bool empty(Square s) const; template int count(Color c) const; - template const Square* list(Color c) const; + template const Square* squares(Color c) const; + template Square square(Color c) const; // Castling int can_castle(Color c) const; @@ -112,7 +123,7 @@ public: // Attacks to/from a given square Bitboard attackers_to(Square s) const; - Bitboard attackers_to(Square s, Bitboard occ) const; + Bitboard attackers_to(Square s, Bitboard occupied) const; Bitboard attacks_from(Piece pc, Square s) const; template Bitboard attacks_from(Square s) const; template Bitboard attacks_from(Square s, Color c) const; @@ -129,13 +140,10 @@ public: // Piece specific bool pawn_passed(Color c, Square s) const; - bool pawn_on_7th(Color c) const; - bool bishop_pair(Color c) const; bool opposite_bishops() const; // Doing and undoing moves - void do_move(Move m, StateInfo& st); - void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck); + void do_move(Move m, StateInfo& st, bool givesCheck); void undo_move(Move m); void do_null_move(StateInfo& st); void undo_null_move(); @@ -148,12 +156,8 @@ public: Key key() const; Key key_after(Move m) const; Key exclusion_key() const; - Key pawn_key() const; Key material_key() const; - - // Incremental piece-square evaluation - Score psq_score() const; - Value non_pawn_material(Color c) const; + Key pawn_key() const; // Other properties of the position Color side_to_move() const; @@ -164,9 +168,12 @@ public: uint64_t nodes_searched() const; void set_nodes_searched(uint64_t n); bool is_draw() const; + int rule50_count() const; + Score psq_score() const; + Value non_pawn_material(Color c) const; // Position consistency check, for debugging - bool pos_is_ok(int* step = NULL) const; + bool pos_is_ok(int* failedStep = nullptr) const; void flip(); private: @@ -175,23 +182,21 @@ private: void set_castling_right(Color c, Square rfrom); void set_state(StateInfo* si) const; - // Helper functions + // Other helpers Bitboard check_blockers(Color c, Color kingColor) const; - void put_piece(Square s, Color c, PieceType pt); - void remove_piece(Square s, Color c, PieceType pt); - void move_piece(Square from, Square to, Color c, PieceType pt); + void put_piece(Color c, PieceType pt, Square s); + void remove_piece(Color c, PieceType pt, Square s); + void move_piece(Color c, PieceType pt, Square from, Square to); template - void do_castling(Square from, Square& to, Square& rfrom, Square& rto); + void do_castling(Color us, Square from, Square& to, Square& rfrom, Square& rto); - // Board and pieces + // Data members Piece board[SQUARE_NB]; Bitboard byTypeBB[PIECE_TYPE_NB]; Bitboard byColorBB[COLOR_NB]; int pieceCount[COLOR_NB][PIECE_TYPE_NB]; Square pieceList[COLOR_NB][PIECE_TYPE_NB][16]; int index[SQUARE_NB]; - - // Other info int castlingRightsMask[SQUARE_NB]; Square castlingRookSquare[CASTLING_RIGHT_NB]; Bitboard castlingPath[CASTLING_RIGHT_NB]; @@ -204,12 +209,14 @@ private: bool chess960; }; -inline uint64_t Position::nodes_searched() const { - return nodes; +extern std::ostream& operator<<(std::ostream& os, const Position& pos); + +inline Color Position::side_to_move() const { + return sideToMove; } -inline void Position::set_nodes_searched(uint64_t n) { - nodes = n; +inline bool Position::empty(Square s) const { + return board[s] == NO_PIECE; } inline Piece Position::piece_on(Square s) const { @@ -220,14 +227,6 @@ inline Piece Position::moved_piece(Move m) const { return board[from_sq(m)]; } -inline bool Position::empty(Square s) const { - return board[s] == NO_PIECE; -} - -inline Color Position::side_to_move() const { - return sideToMove; -} - inline Bitboard Position::pieces() const { return byTypeBB[ALL_PIECES]; } @@ -256,16 +255,17 @@ template inline int Position::count(Color c) const { return pieceCount[c][Pt]; } -template inline const Square* Position::list(Color c) const { +template inline const Square* Position::squares(Color c) const { return pieceList[c][Pt]; } -inline Square Position::ep_square() const { - return st->epSquare; +template inline Square Position::square(Color c) const { + assert(pieceCount[c][Pt] == 1); + return pieceList[c][Pt][0]; } -inline Square Position::king_square(Color c) const { - return pieceList[c][KING][0]; +inline Square Position::ep_square() const { + return st->epSquare; } inline int Position::can_castle(CastlingRight cr) const { @@ -286,7 +286,6 @@ inline Square Position::castling_rook_square(CastlingRight cr) const { template inline Bitboard Position::attacks_from(Square s) const { - return Pt == BISHOP || Pt == ROOK ? attacks_bb(s, byTypeBB[ALL_PIECES]) : Pt == QUEEN ? attacks_from(s) | attacks_from(s) : StepAttacksBB[Pt][s]; @@ -343,28 +342,29 @@ inline Score Position::psq_score() const { } inline Value Position::non_pawn_material(Color c) const { - return st->npMaterial[c]; + return st->nonPawnMaterial[c]; } inline int Position::game_ply() const { return gamePly; } -inline bool Position::opposite_bishops() const { - - return pieceCount[WHITE][BISHOP] == 1 - && pieceCount[BLACK][BISHOP] == 1 - && opposite_colors(pieceList[WHITE][BISHOP][0], pieceList[BLACK][BISHOP][0]); +inline int Position::rule50_count() const { + return st->rule50; } -inline bool Position::bishop_pair(Color c) const { +inline uint64_t Position::nodes_searched() const { + return nodes; +} - return pieceCount[c][BISHOP] >= 2 - && opposite_colors(pieceList[c][BISHOP][0], pieceList[c][BISHOP][1]); +inline void Position::set_nodes_searched(uint64_t n) { + nodes = n; } -inline bool Position::pawn_on_7th(Color c) const { - return pieces(c, PAWN) & rank_bb(relative_rank(c, RANK_7)); +inline bool Position::opposite_bishops() const { + return pieceCount[WHITE][BISHOP] == 1 + && pieceCount[BLACK][BISHOP] == 1 + && opposite_colors(square(WHITE), square(BLACK)); } inline bool Position::is_chess960() const { @@ -379,7 +379,7 @@ inline bool Position::capture_or_promotion(Move m) const { inline bool Position::capture(Move m) const { - // Note that castling is encoded as "king captures the rook" + // Castling is encoded as "king captures the rook" assert(is_ok(m)); return (!empty(to_sq(m)) && type_of(m) != CASTLING) || type_of(m) == ENPASSANT; } @@ -392,7 +392,7 @@ inline Thread* Position::this_thread() const { return thisThread; } -inline void Position::put_piece(Square s, Color c, PieceType pt) { +inline void Position::put_piece(Color c, PieceType pt, Square s) { board[s] = make_piece(c, pt); byTypeBB[ALL_PIECES] |= s; @@ -400,23 +400,10 @@ inline void Position::put_piece(Square s, Color c, PieceType pt) { byColorBB[c] |= s; index[s] = pieceCount[c][pt]++; pieceList[c][pt][index[s]] = s; + pieceCount[c][ALL_PIECES]++; } -inline void Position::move_piece(Square from, Square to, Color c, PieceType pt) { - - // index[from] is not updated and becomes stale. This works as long - // as index[] is accessed just by known occupied squares. - Bitboard from_to_bb = SquareBB[from] ^ SquareBB[to]; - byTypeBB[ALL_PIECES] ^= from_to_bb; - byTypeBB[pt] ^= from_to_bb; - byColorBB[c] ^= from_to_bb; - board[from] = NO_PIECE; - board[to] = make_piece(c, pt); - index[to] = index[from]; - pieceList[c][pt][index[to]] = to; -} - -inline void Position::remove_piece(Square s, Color c, PieceType pt) { +inline void Position::remove_piece(Color c, PieceType pt, Square s) { // WARNING: This is not a reversible operation. If we remove a piece in // do_move() and then replace it in undo_move() we will put it at the end of @@ -425,11 +412,26 @@ inline void Position::remove_piece(Square s, Color c, PieceType pt) { byTypeBB[ALL_PIECES] ^= s; byTypeBB[pt] ^= s; byColorBB[c] ^= s; - /* board[s] = NO_PIECE; */ // Not needed, will be overwritten by capturing + /* board[s] = NO_PIECE; Not needed, overwritten by the capturing one */ Square lastSquare = pieceList[c][pt][--pieceCount[c][pt]]; index[lastSquare] = index[s]; pieceList[c][pt][index[lastSquare]] = lastSquare; pieceList[c][pt][pieceCount[c][pt]] = SQ_NONE; + pieceCount[c][ALL_PIECES]--; +} + +inline void Position::move_piece(Color c, PieceType pt, Square from, Square to) { + + // index[from] is not updated and becomes stale. This works as long as index[] + // is accessed just by known occupied squares. + Bitboard from_to_bb = SquareBB[from] ^ SquareBB[to]; + byTypeBB[ALL_PIECES] ^= from_to_bb; + byTypeBB[pt] ^= from_to_bb; + byColorBB[c] ^= from_to_bb; + board[from] = NO_PIECE; + board[to] = make_piece(c, pt); + index[to] = index[from]; + pieceList[c][pt][index[to]] = to; } #endif // #ifndef POSITION_H_INCLUDED