X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=244d365ba47a67d400cd62fb854886f94de9fa82;hb=01a191936eeb3dc3366554b1423c53da2a1ae56a;hp=761724ad01d5aa9a1d47d47f37cb4bda5d820a8c;hpb=b08ba446f655ba6292cb0b5a1012e790e4ad8d7d;p=stockfish
diff --git a/src/position.h b/src/position.h
index 761724ad..244d365b 100644
--- a/src/position.h
+++ b/src/position.h
@@ -17,35 +17,21 @@
along with this program. If not, see .
*/
-
#if !defined(POSITION_H_INCLUDED)
#define POSITION_H_INCLUDED
-////
-//// Includes
-////
+#include
#include "bitboard.h"
-#include "color.h"
#include "move.h"
-#include "piece.h"
-#include "square.h"
-#include "value.h"
-
-
-////
-//// Constants
-////
+#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
/// move counter for every non-reversible move).
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.
@@ -55,13 +41,13 @@ struct CheckInfo {
explicit CheckInfo(const Position&);
Bitboard dcCandidates;
+ Bitboard pinned;
Bitboard checkSq[8];
- Square ksq;
};
/// Castle rights, encoded as bit fields
-enum CastleRights {
+enum CastleRight {
CASTLES_NONE = 0,
WHITE_OO = 1,
BLACK_OO = 2,
@@ -120,9 +106,6 @@ struct StateInfo {
class Position {
- friend class MaterialInfo;
- friend class EndgameFunctions;
-
Position(); // No default or copy c'tor allowed
Position(const Position& pos);
@@ -142,16 +125,11 @@ public:
void print(Move m = MOVE_NONE) const;
// Copying
- void flipped_copy(const Position& pos);
+ void flip();
// 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;
@@ -175,11 +153,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;
@@ -187,7 +163,7 @@ 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;
@@ -195,6 +171,7 @@ public:
// 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;
@@ -202,9 +179,8 @@ public:
// 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;
@@ -220,8 +196,7 @@ public:
bool square_is_weak(Square s, Color c) const;
// Doing and undoing moves
- void detach();
- void do_setup_move(Move m, StateInfo& St);
+ 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);
@@ -229,7 +204,6 @@ public:
void undo_null_move();
// Static exchange evaluation
- int see(Square from, Square to) const;
int see(Move m) const;
int see_sign(Move m) const;
@@ -246,13 +220,10 @@ public:
// Game termination checks
bool is_mate() const;
- bool is_draw() const;
-
- // Check if side to move could be mated in one
- bool has_mate_threat();
+ template bool is_draw() const;
// Number of plies from starting position
- int startpos_ply_counter() const;
+ int full_moves() const;
// Other properties of the position
bool opposite_colored_bishops() const;
@@ -268,18 +239,18 @@ public:
// Position consistency check, for debugging
bool is_ok(int* failedStep = NULL) const;
- // 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 do_allow_oo(Color c);
- void do_allow_ooo(Color c);
- bool set_castling_rights(char token);
+ 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);
@@ -296,7 +267,7 @@ private:
Key compute_material_key() const;
// Computing incremental evaluation scores and material counts
- static Score pst(Color c, PieceType pt, Square s);
+ static Score pst(Piece p, Square s);
Score compute_value() const;
Value compute_non_pawn_material(Color c) const;
@@ -317,10 +288,10 @@ private:
Color sideToMove;
Key history[MaxGameLength];
int castleRightsMask[64];
+ Square castleRookSquare[16]; // [CastleRights]
StateInfo startState;
- File initialKFile, initialKRFile, initialQRFile;
- bool isChess960;
- int startPosPlyCounter;
+ bool chess960;
+ int fullMoves;
int threadID;
int64_t nodes;
StateInfo* st;
@@ -332,16 +303,8 @@ 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];
};
-
-////
-//// Inline functions
-////
-
inline int64_t Position::nodes_searched() const {
return nodes;
}
@@ -354,30 +317,10 @@ inline Piece Position::piece_on(Square s) const {
return board[s];
}
-inline Color Position::color_of_piece_on(Square s) const {
- return color_of_piece(piece_on(s));
-}
-
-inline PieceType Position::type_of_piece_on(Square s) const {
- return type_of_piece(piece_on(s));
-}
-
inline bool Position::square_is_empty(Square s) const {
return piece_on(s) == PIECE_NONE;
}
-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 PieceValueMidgame[piece_on(s)];
-}
-
-inline Value Position::endgame_value_of_piece_on(Square s) const {
- return PieceValueEndgame[piece_on(s)];
-}
-
inline Color Position::side_to_move() const {
return sideToMove;
}
@@ -430,34 +373,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 NonSlidingAttacksBB[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 NonSlidingAttacksBB[Piece][s];
+ return StepAttacksBB[Piece][s];
}
template<>
@@ -479,7 +414,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;
}
@@ -507,8 +442,8 @@ inline Key Position::get_material_key() const {
return st->materialKey;
}
-inline Score Position::pst(Color c, PieceType pt, Square s) {
- return PieceSquareTable[piece_of_color_and_type(c, pt)][s];
+inline Score Position::pst(Piece p, Square s) {
+ return PieceSquareTable[p][s];
}
inline Score Position::pst_delta(Piece piece, Square from, Square to) {
@@ -526,39 +461,40 @@ 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::startpos_ply_counter() const {
- return startPosPlyCounter;
+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
- && !same_color_squares(piece_list(WHITE, BISHOP, 0), piece_list(BLACK, BISHOP, 0));
+ return piece_count(WHITE, BISHOP) == 1 && piece_count(BLACK, BISHOP) == 1
+ && 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) & relative_rank_bb(c, RANK_7);
+ return pieces(PAWN, c) & rank_bb(relative_rank(c, RANK_7));
}
inline bool Position::is_chess960() const {
- return isChess960;
+ 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_type() const {
@@ -569,12 +505,4 @@ 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)