X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fposition.h;h=0cc6a0ca7a91fdbc4658bbade5eb763233f13007;hb=f25582d4b8860ff9fbe7dcf9873ed2986b1a7ed2;hp=88090ad2227232394e9a5ce81cbb6fb6fe9535d8;hpb=b50dc1647fa70178d09beb529815cb565f9774c0;p=stockfish
diff --git a/src/position.h b/src/position.h
index 88090ad2..0cc6a0ca 100644
--- a/src/position.h
+++ b/src/position.h
@@ -17,41 +17,14 @@
along with this program. If not, see .
*/
-
#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
#include "bitboard.h"
-#include "color.h"
-#include "direction.h"
#include "move.h"
-#include "piece.h"
-#include "square.h"
-#include "value.h"
-
-
-////
-//// Constants
-////
-
-/// FEN string for the initial position
-const std::string StartPosition = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
+#include "types.h"
/// Maximum number of plies per game (220 should be enough, because the
/// maximum search depth is 100, and during position setup we reset the
@@ -59,37 +32,16 @@ const std::string StartPosition = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w
const int MaxGameLength = 220;
-////
-//// Types
-////
-
-/// struct checkInfo is initialized at c'tor time and keeps
-/// info used to detect if a move gives check.
+/// The checkInfo struct is initialized at c'tor time and keeps info used
+/// to detect if a move gives check.
struct CheckInfo {
explicit CheckInfo(const Position&);
Bitboard dcCandidates;
+ Bitboard pinned;
Bitboard checkSq[8];
- Square ksq;
-};
-
-/// Castle rights, encoded as bit fields
-
-enum CastleRights {
- NO_CASTLES = 0,
- WHITE_OO = 1,
- BLACK_OO = 2,
- WHITE_OOO = 4,
- BLACK_OOO = 8,
- ALL_CASTLES = 15
-};
-
-/// Game phase
-enum Phase {
- PHASE_ENDGAME = 0,
- PHASE_MIDGAME = 128
};
@@ -97,6 +49,7 @@ enum Phase {
/// object to its previous state when we retract a move. Whenever a move
/// is made on the board (by calling Position::do_move), an StateInfo object
/// must be passed as a parameter.
+class Position;
struct StateInfo {
Key pawnKey, materialKey;
@@ -105,7 +58,7 @@ struct StateInfo {
Score value;
Value npMaterial[2];
- PieceType capture;
+ PieceType capturedType;
Key key;
Bitboard checkersBB;
StateInfo* previous;
@@ -136,39 +89,21 @@ struct StateInfo {
class Position {
- friend class MaterialInfo;
- friend class EndgameFunctions;
-
Position(); // No default or copy c'tor allowed
Position(const Position& pos);
public:
- enum GamePhase {
- MidGame,
- EndGame
- };
-
- // 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;
- // Copying
- void flipped_copy(const Position& pos);
-
// The piece on a given square
Piece piece_on(Square s) const;
- PieceType type_of_piece_on(Square s) const;
- Color color_of_piece_on(Square s) const;
bool square_is_empty(Square s) const;
- bool square_is_occupied(Square s) const;
- Value midgame_value_of_piece_on(Square s) const;
- Value endgame_value_of_piece_on(Square s) const;
// Side to move
Color side_to_move() const;
@@ -176,7 +111,7 @@ public:
// Bitboard representation of the position
Bitboard empty_squares() const;
Bitboard occupied_squares() const;
- Bitboard pieces_of_color(Color c) const;
+ Bitboard pieces(Color c) const;
Bitboard pieces(PieceType pt) const;
Bitboard pieces(PieceType pt, Color c) const;
Bitboard pieces(PieceType pt1, PieceType pt2) const;
@@ -192,11 +127,9 @@ public:
Square king_square(Color c) const;
// Castling rights
- bool can_castle_kingside(Color c) const;
- bool can_castle_queenside(Color c) const;
+ bool can_castle(CastleRight f) const;
bool can_castle(Color c) const;
- Square initial_kr_square(Color c) const;
- Square initial_qr_square(Color c) const;
+ Square castle_rook_square(CastleRight f) const;
// Bitboards for pinned pieces and discovered check candidates
Bitboard discovered_check_candidates(Color c) const;
@@ -204,39 +137,36 @@ public:
// Checking pieces and under check information
Bitboard checkers() const;
- bool is_check() const;
+ bool in_check() const;
// Piece lists
- Square piece_list(Color c, PieceType pt, int index) const;
- const Square* piece_list_begin(Color c, PieceType pt) const;
+ const Square* piece_list(Color c, PieceType pt) const;
// Information about attacks to or from a given square
Bitboard attackers_to(Square s) const;
+ Bitboard attackers_to(Square s, Bitboard occ) 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;
// Properties of moves
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, const CheckInfo& ci) const;
+ bool move_is_pl(const Move m) const;
+ bool move_gives_check(Move m, const CheckInfo& ci) 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;
// Piece captured with previous moves
- PieceType captured_piece() const;
+ PieceType captured_piece_type() const;
// Information about pawns
bool pawn_is_passed(Color c, Square s) const;
- // Weak squares
- bool square_is_weak(Square s, Color c) const;
-
// Doing and undoing moves
- void detach();
+ void do_setup_move(Move m);
void do_move(Move m, StateInfo& st);
void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck);
void undo_move(Move m);
@@ -244,9 +174,7 @@ public:
void undo_null_move();
// 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
@@ -262,44 +190,43 @@ public:
// Game termination checks
bool is_mate() const;
- bool is_draw() const;
-
- // Check if one side threatens a mate in one
- bool has_mate_threat(Color c);
+ template bool is_draw() const;
- // Number of plies since the last non-reversible move
- int rule_50_counter() const;
+ // Number of plies from starting position
+ int full_moves() 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();
+ int64_t nodes_searched() const;
+ void set_nodes_searched(int64_t n);
// Position consistency check, for debugging
bool is_ok(int* failedStep = NULL) const;
+ void flip();
- // Static member functions
- static void init_zobrist();
- static void init_piece_square_tables();
+ // Global initialization
+ static void init();
private:
// Initialization helper functions (used while setting up a position)
void clear();
+ void detach();
void put_piece(Piece p, Square s);
- void allow_oo(Color c);
- void allow_ooo(Color c);
+ void set_castle(int f, Square ksq, Square rsq);
+ void set_castling_rights(char token);
+ bool move_is_pl_slow(const Move m) const;
// Helper functions for doing and undoing moves
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
Bitboard hidden_checkers(Color c) const;
@@ -310,72 +237,59 @@ private:
Key compute_material_key() const;
// Computing incremental evaluation scores and material counts
- Score pst(Color c, PieceType pt, Square s) const;
+ Score pst(Piece p, Square s) const;
Score compute_value() const;
Value compute_non_pawn_material(Color c) const;
// Board
- Piece board[64];
+ Piece board[64]; // [square]
// Bitboards
- Bitboard byTypeBB[8], byColorBB[2];
+ Bitboard byTypeBB[8]; // [pieceType]
+ Bitboard byColorBB[2]; // [color]
// Piece counts
- int pieceCount[2][8]; // [color][pieceType]
+ int pieceCount[2][8]; // [color][pieceType]
// Piece lists
- Square pieceList[2][8][16]; // [color][pieceType][index]
- int index[64]; // [square]
+ Square pieceList[2][8][16]; // [color][pieceType][index]
+ int index[64]; // [square]
// Other info
Color sideToMove;
Key history[MaxGameLength];
- int castleRightsMask[64];
+ int castleRightsMask[64]; // [square]
+ Square castleRookSquare[16]; // [castleRight]
StateInfo startState;
- File initialKFile, initialKRFile, initialQRFile;
+ bool chess960;
+ int fullMoves;
int threadID;
+ int64_t nodes;
StateInfo* st;
// Static variables
- static Key zobrist[2][8][64];
- static Key zobEp[64];
- static Key zobCastle[16];
+ static Score pieceSquareTable[16][64]; // [piece][square]
+ static Key zobrist[2][8][64]; // [color][pieceType][square]
+ static Key zobEp[64]; // [square]
+ static Key zobCastle[16]; // [castleRight]
static Key zobSideToMove;
- static Score PieceSquareTable[16][64];
static Key zobExclusion;
};
-
-////
-//// Inline functions
-////
-
-inline Piece Position::piece_on(Square s) const {
- return board[s];
+inline int64_t Position::nodes_searched() const {
+ return nodes;
}
-inline Color Position::color_of_piece_on(Square s) const {
- return color_of_piece(piece_on(s));
+inline void Position::set_nodes_searched(int64_t n) {
+ nodes = n;
}
-inline PieceType Position::type_of_piece_on(Square s) const {
- return type_of_piece(piece_on(s));
+inline Piece Position::piece_on(Square s) const {
+ return board[s];
}
inline bool Position::square_is_empty(Square s) const {
- return piece_on(s) == EMPTY;
-}
-
-inline bool Position::square_is_occupied(Square s) const {
- return !square_is_empty(s);
-}
-
-inline Value Position::midgame_value_of_piece_on(Square s) const {
- return piece_value_midgame(piece_on(s));
-}
-
-inline Value Position::endgame_value_of_piece_on(Square s) const {
- return piece_value_endgame(piece_on(s));
+ return piece_on(s) == PIECE_NONE;
}
inline Color Position::side_to_move() const {
@@ -387,10 +301,10 @@ 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 {
+inline Bitboard Position::pieces(Color c) const {
return byColorBB[c];
}
@@ -414,11 +328,7 @@ inline int Position::piece_count(Color c, PieceType pt) const {
return pieceCount[c][pt];
}
-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 {
+inline const Square* Position::piece_list(Color c, PieceType pt) const {
return pieceList[c][pt];
}
@@ -430,34 +340,26 @@ inline Square Position::king_square(Color c) const {
return pieceList[c][KING][0];
}
-inline bool Position::can_castle_kingside(Color side) const {
- return st->castleRights & (1+int(side));
-}
-
-inline bool Position::can_castle_queenside(Color side) const {
- return st->castleRights & (4+4*int(side));
-}
-
-inline bool Position::can_castle(Color side) const {
- return can_castle_kingside(side) || can_castle_queenside(side);
+inline bool Position::can_castle(CastleRight f) const {
+ return st->castleRights & f;
}
-inline Square Position::initial_kr_square(Color c) const {
- return relative_square(c, make_square(initialKRFile, RANK_1));
+inline bool Position::can_castle(Color c) const {
+ return st->castleRights & ((WHITE_OO | WHITE_OOO) << c);
}
-inline Square Position::initial_qr_square(Color c) const {
- return relative_square(c, make_square(initialQRFile, RANK_1));
+inline Square Position::castle_rook_square(CastleRight f) const {
+ return castleRookSquare[f];
}
template<>
inline Bitboard Position::attacks_from(Square s, Color c) const {
- return StepAttackBB[piece_of_color_and_type(c, PAWN)][s];
+ return StepAttacksBB[make_piece(c, PAWN)][s];
}
template // Knight and King and white pawns
inline Bitboard Position::attacks_from(Square s) const {
- return StepAttackBB[Piece][s];
+ return StepAttacksBB[Piece][s];
}
template<>
@@ -479,7 +381,7 @@ inline Bitboard Position::checkers() const {
return st->checkersBB;
}
-inline bool Position::is_check() const {
+inline bool Position::in_check() const {
return st->checkersBB != EmptyBoardBB;
}
@@ -487,10 +389,6 @@ 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::square_is_weak(Square s, Color c) const {
- return !(pieces(PAWN, opposite_color(c)) & attack_span_mask(c, s));
-}
-
inline Key Position::get_key() const {
return st->key;
}
@@ -507,12 +405,12 @@ inline Key Position::get_material_key() const {
return st->materialKey;
}
-inline Score Position::pst(Color c, PieceType pt, Square s) const {
- return PieceSquareTable[piece_of_color_and_type(c, pt)][s];
+inline Score Position::pst(Piece p, Square s) const {
+ return pieceSquareTable[p][s];
}
inline Score Position::pst_delta(Piece piece, Square from, Square to) const {
- return PieceSquareTable[piece][to] - PieceSquareTable[piece][from];
+ return pieceSquareTable[piece][to] - pieceSquareTable[piece][from];
}
inline Score Position::value() const {
@@ -526,41 +424,45 @@ inline Value Position::non_pawn_material(Color c) const {
inline bool Position::move_is_passed_pawn_push(Move m) const {
Color c = side_to_move();
- return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN)
+ return piece_on(move_from(m)) == make_piece(c, PAWN)
&& pawn_is_passed(c, move_to(m));
}
-inline int Position::rule_50_counter() const {
-
- return st->rule50;
+inline int Position::full_moves() const {
+ return fullMoves;
}
inline bool Position::opposite_colored_bishops() const {
return piece_count(WHITE, BISHOP) == 1
&& piece_count(BLACK, BISHOP) == 1
- && square_color(piece_list(WHITE, BISHOP, 0)) != square_color(piece_list(BLACK, BISHOP, 0));
+ && opposite_color_squares(piece_list(WHITE, BISHOP)[0], piece_list(BLACK, BISHOP)[0]);
}
inline bool Position::has_pawn_on_7th(Color c) const {
+ return pieces(PAWN, c) & rank_bb(relative_rank(c, RANK_7));
+}
- return pieces(PAWN, c) & relative_rank_bb(c, RANK_7);
+inline bool Position::is_chess960() const {
+ return chess960;
}
-inline bool Position::move_is_capture(Move m) const {
+inline bool Position::move_is_capture_or_promotion(Move m) const {
- // Move must not be MOVE_NONE !
- return (m & (3 << 15)) ? !move_is_castle(m) : !square_is_empty(move_to(m));
+ assert(m != MOVE_NONE && m != MOVE_NULL);
+ return move_is_special(m) ? !move_is_castle(m) : !square_is_empty(move_to(m));
}
-inline bool Position::move_is_capture_or_promotion(Move m) const {
+inline bool Position::move_is_capture(Move m) const {
+
+ assert(m != MOVE_NONE && m != MOVE_NULL);
- // Move must not be MOVE_NONE !
- return (m & (0x1F << 12)) ? !move_is_castle(m) : !square_is_empty(move_to(m));
+ // Note that castle is coded as "king captures the rook"
+ return (!square_is_empty(move_to(m)) && !move_is_castle(m)) || move_is_ep(m);
}
-inline PieceType Position::captured_piece() const {
- return st->capture;
+inline PieceType Position::captured_piece_type() const {
+ return st->capturedType;
}
inline int Position::thread() const {