X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=b2538e96b5cf9316dc2907bbfe43aec9d929dcc3;hp=0b2a0cca4e0f9afab86bbf667f0e4160947a6bb8;hb=ca14345ba26fc40e1039029659f57028f510502f;hpb=e6310b3469b07b6bbecf8d8f75367a655090f22b diff --git a/src/position.h b/src/position.h index 0b2a0cca..b2538e96 100644 --- a/src/position.h +++ b/src/position.h @@ -2,6 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) 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 @@ -22,13 +23,16 @@ #include #include // For offsetof() +#include +#include // For std::unique_ptr #include +#include #include "bitboard.h" #include "types.h" class Position; -struct Thread; +class Thread; namespace PSQT { @@ -37,8 +41,8 @@ namespace PSQT { void init(); } -/// CheckInfo struct is initialized at c'tor time and keeps info used to detect -/// if a move gives check. +/// CheckInfo struct is initialized at constructor time and keeps info used to +/// detect if a move gives check. struct CheckInfo { @@ -74,6 +78,9 @@ struct StateInfo { StateInfo* previous; }; +// In a std::deque references to elements are unaffected upon resizing +typedef std::unique_ptr> StateListPtr; + /// Position class stores information regarding the board representation as /// pieces, side to move, hash keys, castling info, etc. Important methods are @@ -82,19 +89,15 @@ struct StateInfo { class Position { - friend std::ostream& operator<<(std::ostream&, const Position&); - public: static void init(); - Position() = default; // To define the global object RootPos + Position() = default; 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 + Position& operator=(const Position&) = delete; // FEN string input/output - void set(const std::string& fenStr, bool isChess960, Thread* th); + Position& set(const std::string& fenStr, bool isChess960, StateInfo* si, Thread* th); const std::string fen() const; // Position representation @@ -128,6 +131,7 @@ public: Bitboard attacks_from(Piece pc, Square s) const; template Bitboard attacks_from(Square s) const; template Bitboard attacks_from(Square s, Color c) const; + Bitboard slider_blockers(Bitboard target, Bitboard sliders, Square s) const; // Properties of moves bool legal(Move m, Bitboard pinned) const; @@ -179,12 +183,10 @@ public: private: // Initialization helpers (used while setting up a position) - void clear(); void set_castling_right(Color c, Square rfrom); void set_state(StateInfo* si) const; // Other helpers - Bitboard check_blockers(Color c, Color kingColor) const; 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); @@ -201,7 +203,6 @@ private: int castlingRightsMask[SQUARE_NB]; Square castlingRookSquare[CASTLING_RIGHT_NB]; Bitboard castlingPath[CASTLING_RIGHT_NB]; - StateInfo startState; uint64_t nodes; int gamePly; Color sideToMove; @@ -210,6 +211,8 @@ private: bool chess960; }; +extern std::ostream& operator<<(std::ostream& os, const Position& pos); + inline Color Position::side_to_move() const { return sideToMove; } @@ -308,11 +311,11 @@ inline Bitboard Position::checkers() const { } inline Bitboard Position::discovered_check_candidates() const { - return check_blockers(sideToMove, ~sideToMove); + return slider_blockers(pieces(sideToMove), pieces(sideToMove), square(~sideToMove)); } inline Bitboard Position::pinned_pieces(Color c) const { - return check_blockers(c, c); + return slider_blockers(pieces(c), pieces(~c), square(c)); } inline bool Position::pawn_passed(Color c, Square s) const {