X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=c333e55a63ab859e43d7085f2d80f89e4ab64df6;hp=7616eadc966414ac63e6189a8d4d58051ef4dfa6;hb=13d1f0ae4301b86c610a58332c3c19d9101704da;hpb=fe72c93141627c8109761da6546014a8d0461450
diff --git a/src/position.h b/src/position.h
index 7616eadc..c333e55a 100644
--- a/src/position.h
+++ b/src/position.h
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(POSITION_H_INCLUDED)
+#ifndef POSITION_H_INCLUDED
#define POSITION_H_INCLUDED
#include
@@ -43,16 +43,16 @@ struct CheckInfo {
};
-/// The StateInfo struct stores information we need to restore a Position
+/// 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.
+/// is made on the board (by calling Position::do_move), a StateInfo
+/// object must be passed as a parameter.
struct StateInfo {
Key pawnKey, materialKey;
Value npMaterial[COLOR_NB];
int castleRights, rule50, pliesFromNull;
- Score psqScore;
+ Score psq;
Square epSquare;
Key key;
@@ -67,27 +67,10 @@ struct StateInfo {
const size_t StateCopySize64 = offsetof(StateInfo, key) / sizeof(uint64_t) + 1;
-/// The position data structure. A position consists of the following data:
-///
-/// * For each piece type, a bitboard representing the squares occupied
-/// by pieces of that type.
-/// * For each color, a bitboard representing the squares occupied by
-/// pieces of that color.
-/// * A bitboard of all occupied squares.
-/// * A bitboard of all checking pieces.
-/// * A 64-entry array of pieces, indexed by the squares of the board.
-/// * The current side to move.
-/// * Information about the castling rights for both sides.
-/// * The initial files of the kings and both pairs of rooks. This is
-/// used to implement the Chess960 castling rules.
-/// * The en passant square (which is SQ_NONE if no en passant capture is
-/// possible).
-/// * The squares of the kings for both sides.
-/// * Hash keys for the position itself, the current pawn structure, and
-/// the current material situation.
-/// * Hash keys for all previous positions in the game for detecting
-/// repetition draws.
-/// * A counter for detecting 50 move rule draws.
+/// 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.
class Position {
public:
@@ -95,6 +78,7 @@ public:
Position(const Position& p, Thread* t) { *this = p; 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
void set(const std::string& fen, bool isChess960, Thread* th);
@@ -111,9 +95,9 @@ public:
Piece piece_on(Square s) const;
Square king_square(Color c) const;
Square ep_square() const;
- bool is_empty(Square s) const;
- const Square* piece_list(Color c, PieceType pt) const;
- int piece_count(Color c, PieceType pt) const;
+ bool empty(Square s) const;
+ template int count(Color c) const;
+ template const Square* list(Color c) const;
// Castling
int can_castle(CastleRight f) const;
@@ -124,7 +108,7 @@ public:
// Checking
Bitboard checkers() const;
Bitboard discovered_check_candidates() const;
- Bitboard pinned_pieces() const;
+ Bitboard pinned_pieces(Color toMove) const;
// Attacks to/from a given square
Bitboard attackers_to(Square s) const;
@@ -135,20 +119,20 @@ public:
template Bitboard attacks_from(Square s, Color c) const;
// Properties of moves
- bool move_gives_check(Move m, const CheckInfo& ci) const;
- bool pl_move_is_legal(Move m, Bitboard pinned) const;
- bool is_pseudo_legal(const Move m) const;
- bool is_capture(Move m) const;
- bool is_capture_or_promotion(Move m) const;
- bool is_passed_pawn_push(Move m) const;
- Piece piece_moved(Move m) const;
+ bool legal(Move m, Bitboard pinned) const;
+ bool pseudo_legal(const Move m) const;
+ bool capture(Move m) const;
+ bool capture_or_promotion(Move m) const;
+ bool gives_check(Move m, const CheckInfo& ci) const;
+ bool passed_pawn_push(Move m) const;
+ Piece moved_piece(Move m) const;
PieceType captured_piece_type() const;
// Piece specific
- bool pawn_is_passed(Color c, Square s) const;
+ bool pawn_passed(Color c, Square s) const;
bool pawn_on_7th(Color c) const;
- bool opposite_bishops() const;
bool bishop_pair(Color c) const;
+ bool opposite_bishops() const;
// Doing and undoing moves
void do_move(Move m, StateInfo& st);
@@ -169,7 +153,6 @@ public:
// Incremental piece-square evaluation
Score psq_score() const;
- Score psq_delta(Piece p, Square from, Square to) const;
Value non_pawn_material(Color c) const;
// Other properties of the position
@@ -188,12 +171,14 @@ public:
private:
// Initialization helpers (used while setting up a position)
void clear();
- void put_piece(Piece p, Square s);
void set_castle_right(Color c, Square rfrom);
// Helper functions
void do_castle(Square kfrom, Square kto, Square rfrom, Square rto);
- template Bitboard hidden_checkers() const;
+ Bitboard hidden_checkers(Square ksq, Color c, Color toMove) 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);
// Computing hash keys from scratch (for initialization and debugging)
Key compute_key() const;
@@ -237,11 +222,11 @@ inline Piece Position::piece_on(Square s) const {
return board[s];
}
-inline Piece Position::piece_moved(Move m) const {
+inline Piece Position::moved_piece(Move m) const {
return board[from_sq(m)];
}
-inline bool Position::is_empty(Square s) const {
+inline bool Position::empty(Square s) const {
return board[s] == NO_PIECE;
}
@@ -273,12 +258,12 @@ inline Bitboard Position::pieces(Color c, PieceType pt1, PieceType pt2) const {
return byColorBB[c] & (byTypeBB[pt1] | byTypeBB[pt2]);
}
-inline int Position::piece_count(Color c, PieceType pt) const {
- return pieceCount[c][pt];
+template inline int Position::count(Color c) const {
+ return pieceCount[c][Pt];
}
-inline const Square* Position::piece_list(Color c, PieceType pt) const {
- return pieceList[c][pt];
+template inline const Square* Position::list(Color c) const {
+ return pieceList[c][Pt];
}
inline Square Position::ep_square() const {
@@ -331,23 +316,25 @@ inline Bitboard Position::checkers() const {
}
inline Bitboard Position::discovered_check_candidates() const {
- return hidden_checkers();
+ return hidden_checkers(king_square(~sideToMove), sideToMove, sideToMove);
}
-inline Bitboard Position::pinned_pieces() const {
- return hidden_checkers();
+inline Bitboard Position::pinned_pieces(Color toMove) const {
+ return hidden_checkers(king_square(toMove), ~toMove, toMove);
}
-inline bool Position::pawn_is_passed(Color c, Square s) const {
+inline bool Position::pawn_passed(Color c, Square s) const {
return !(pieces(~c, PAWN) & passed_pawn_mask(c, s));
}
-inline Key Position::key() const {
- return st->key;
+inline bool Position::passed_pawn_push(Move m) const {
+
+ return type_of(moved_piece(m)) == PAWN
+ && pawn_passed(sideToMove, to_sq(m));
}
-inline Key Position::exclusion_key() const {
- return st->key ^ Zobrist::exclusion;
+inline Key Position::key() const {
+ return st->key;
}
inline Key Position::pawn_key() const {
@@ -358,24 +345,14 @@ inline Key Position::material_key() const {
return st->materialKey;
}
-inline Score Position::psq_delta(Piece p, Square from, Square to) const {
- return pieceSquareTable[p][to] - pieceSquareTable[p][from];
-}
-
inline Score Position::psq_score() const {
- return st->psqScore;
+ return st->psq;
}
inline Value Position::non_pawn_material(Color c) const {
return st->npMaterial[c];
}
-inline bool Position::is_passed_pawn_push(Move m) const {
-
- return type_of(piece_moved(m)) == PAWN
- && pawn_is_passed(sideToMove, to_sq(m));
-}
-
inline int Position::game_ply() const {
return gamePly;
}
@@ -401,17 +378,17 @@ inline bool Position::is_chess960() const {
return chess960;
}
-inline bool Position::is_capture_or_promotion(Move m) const {
+inline bool Position::capture_or_promotion(Move m) const {
assert(is_ok(m));
- return type_of(m) ? type_of(m) != CASTLE : !is_empty(to_sq(m));
+ return type_of(m) ? type_of(m) != CASTLE : !empty(to_sq(m));
}
-inline bool Position::is_capture(Move m) const {
+inline bool Position::capture(Move m) const {
// Note that castle is coded as "king captures the rook"
assert(is_ok(m));
- return (!is_empty(to_sq(m)) && type_of(m) != CASTLE) || type_of(m) == ENPASSANT;
+ return (!empty(to_sq(m)) && type_of(m) != CASTLE) || type_of(m) == ENPASSANT;
}
inline PieceType Position::captured_piece_type() const {
@@ -422,4 +399,46 @@ inline Thread* Position::this_thread() const {
return thisThread;
}
-#endif // !defined(POSITION_H_INCLUDED)
+inline void Position::put_piece(Square s, Color c, PieceType pt) {
+
+ board[s] = make_piece(c, pt);
+ byTypeBB[ALL_PIECES] |= s;
+ byTypeBB[pt] |= s;
+ byColorBB[c] |= s;
+ pieceCount[c][ALL_PIECES]++;
+ index[s] = pieceCount[c][pt]++;
+ pieceList[c][pt][index[s]] = s;
+}
+
+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) {
+
+ // 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
+ // the list and not in its original place, it means index[] and pieceList[]
+ // are not guaranteed to be invariant to a do_move() + undo_move() sequence.
+ byTypeBB[ALL_PIECES] ^= s;
+ byTypeBB[pt] ^= s;
+ byColorBB[c] ^= s;
+ /* board[s] = NO_PIECE; */ // Not needed, will be overwritten by capturing
+ pieceCount[c][ALL_PIECES]--;
+ 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;
+}
+
+#endif // #ifndef POSITION_H_INCLUDED