X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=94b7003373d817fe6f40be5b13701b4197c6fd20;hp=48f40dac47e66598b97f1384490861cc6c2ac7aa;hb=683e6dc6566719f8737fad9bc30580bb0b4d8d20;hpb=5dc23121215039938a9ef4e59ae934312774571c
diff --git a/src/position.h b/src/position.h
index 48f40dac..94b70033 100644
--- a/src/position.h
+++ b/src/position.h
@@ -7,12 +7,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
@@ -25,8 +25,8 @@
#if defined(_MSC_VER)
// Forcing value to bool 'true' or 'false' (performance warning)
-#pragma warning(disable: 4800)
-
+#pragma warning(disable: 4800)
+
#endif
////
@@ -48,7 +48,7 @@
////
/// FEN string for the initial position:
-const std::string StartPosition =
+const std::string StartPosition =
"rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
/// Maximum number of plies per game (220 should be enough, because the
@@ -64,9 +64,9 @@ const int MaxGameLength = 220;
/// Castle rights, encoded as bit fields:
enum CastleRights {
- NO_CASTLES = 0,
+ NO_CASTLES = 0,
WHITE_OO = 1,
- BLACK_OO = 2,
+ BLACK_OO = 2,
WHITE_OOO = 4,
BLACK_OOO = 8,
ALL_CASTLES = 15
@@ -82,17 +82,17 @@ enum CastleRights {
struct UndoInfo {
int castleRights;
Square epSquare;
- Bitboard checkersBB;
+ Bitboard checkersBB, pinners[2], pinned[2], dcCandidates[2];
Key key, pawnKey, materialKey;
int rule50;
Move lastMove;
- PieceType capture;
Value mgValue, egValue;
+ PieceType capture;
};
/// 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 occupiecd by
@@ -117,17 +117,18 @@ struct UndoInfo {
class Position {
friend class MaterialInfo;
+ friend class EndgameFunctions;
public:
// Constructors
Position() {};
- Position(const Position &pos);
- Position(const std::string &fen);
+ Position(const Position& pos);
+ Position(const std::string& fen);
// Text input/output
- void from_fen(const std::string &fen);
+ void from_fen(const std::string& fen);
const std::string to_fen() const;
- void print() const;
+ void print(Move m = MOVE_NONE) const;
// Copying
void copy(const Position &pos);
@@ -173,13 +174,13 @@ public:
// Number of pieces of each color and type
int piece_count(Color c, PieceType pt) const;
- // The en passant square:
+ // The en passant square
Square ep_square() const;
// Current king position for each color
Square king_square(Color c) const;
- // Castling rights.
+ // Castling rights
bool can_castle_kingside(Color c) const;
bool can_castle_queenside(Color c) const;
bool can_castle(Color c) const;
@@ -196,6 +197,7 @@ public:
// Bitboards for pinned pieces and discovered check candidates
Bitboard discovered_check_candidates(Color c) const;
+ Bitboard pinned_pieces(Color c, Bitboard& p) const;
Bitboard pinned_pieces(Color c) const;
// Checking pieces
@@ -214,13 +216,11 @@ public:
template
Bitboard piece_attacks_square(Square f, Square t) const; // Dispatch at compile-time
- bool piece_attacks_square(Square f, Square t) const; // Dispatch at run-time
+ bool piece_attacks_square(Piece p, Square f, Square t) const; // Dispatch at run-time
// Properties of moves
- bool move_is_legal(Move m) const;
- bool move_is_legal(Move m, Bitboard pinned) const;
+ bool pl_move_is_legal(Move m) const;
bool move_is_check(Move m) const;
- bool move_is_check(Move m, Bitboard dcCandidates) const;
bool move_is_capture(Move m) const;
bool move_is_deep_pawn_push(Move m) const;
bool move_is_pawn_push_to_7th(Move m) const;
@@ -244,7 +244,6 @@ public:
void backup(UndoInfo &u) const;
void restore(const UndoInfo &u);
void do_move(Move m, UndoInfo &u);
- void do_move(Move m, UndoInfo &u, Bitboard dcCandidates);
void undo_move(Move m, const UndoInfo &u);
void do_null_move(UndoInfo &u);
void undo_null_move(const UndoInfo &u);
@@ -252,6 +251,7 @@ public:
// Static exchange evaluation
int see(Square from, Square to) const;
int see(Move m) const;
+ int see(Square to) const;
// Accessing hash keys
Key get_key() const;
@@ -266,7 +266,7 @@ public:
Value mg_pst_delta(Move m) const;
// Game termination checks
- bool is_mate();
+ bool is_mate() const;
bool is_draw() const;
// Check if one side threatens a mate in one
@@ -281,7 +281,7 @@ public:
// Reset the gamePly variable to 0
void reset_game_ply();
-
+
// Position consistency check, for debugging
bool is_ok(int* failedStep = NULL) const;
@@ -297,6 +297,7 @@ private:
void allow_ooo(Color c);
// Helper functions for doing and undoing moves
+ void do_capture_move(Move m, PieceType capture, Color them, Square to);
void do_castle_move(Move m);
void do_promotion_move(Move m, UndoInfo &u);
void do_ep_move(Move m);
@@ -305,6 +306,12 @@ private:
void undo_ep_move(Move m);
void find_checkers();
+ template
+ void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates);
+
+ template
+ Bitboard hidden_checks(Color c, Square ksq, Bitboard& pinners) const;
+
// Computing hash keys from scratch (for initialization and debugging)
Key compute_key() const;
Key compute_pawn_key() const;
@@ -320,13 +327,14 @@ private:
// Bitboards
Bitboard byColorBB[2], byTypeBB[8];
Bitboard checkersBB;
+ mutable Bitboard pinners[2], pinned[2], dcCandidates[2];
// Board
Piece board[64];
// Piece counts
int pieceCount[2][8]; // [color][pieceType]
-
+
// Piece lists
Square pieceList[2][8][16]; // [color][pieceType][index]
int index[64];
@@ -520,7 +528,12 @@ inline Square Position::initial_qr_square(Color c) const {
}
inline Bitboard Position::pawn_attacks(Color c, Square s) const {
- return StepAttackBB[pawn_of_color(c)][s];
+ return StepAttackBB[piece_of_color_and_type(c, PAWN)][s];
+}
+
+template<>
+inline Bitboard Position::piece_attacks(Square s) const {
+ return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s];
}
template<>
@@ -553,7 +566,7 @@ inline Bitboard Position::checkers() const {
}
inline bool Position::is_check() const {
- return checkers() != EmptyBoardBB;
+ return checkersBB != EmptyBoardBB;
}
inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const {
@@ -565,6 +578,16 @@ Bitboard Position::piece_attacks_square(Square f, Square t) const {
return bit_is_set(piece_attacks(f), t);
}
+inline Bitboard Position::attacks_to(Square s, Color c) const {
+
+ return attacks_to(s) & pieces_of_color(c);
+}
+
+inline bool Position::square_is_attacked(Square s, Color c) const {
+
+ return attacks_to(s, c) != EmptyBoardBB;
+}
+
inline bool Position::pawn_is_passed(Color c, Square s) const {
return !(pawns(opposite_color(c)) & passed_pawn_mask(c, s));
}
@@ -588,7 +611,7 @@ inline bool Position::file_is_half_open(Color c, File f) const {
inline bool Position::square_is_weak(Square s, Color c) const {
return !(pawns(c) & outpost_mask(opposite_color(c), s));
}
-
+
inline Key Position::get_key() const {
return key;
}
@@ -639,7 +662,7 @@ inline Phase Position::game_phase() const {
static const Value EndgameLimit = 4 * RookValueMidgame - Value(325);
Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK);
-
+
if (npm >= MidgameLimit)
return PHASE_MIDGAME;
else if(npm <= EndgameLimit)
@@ -651,28 +674,28 @@ inline Phase Position::game_phase() const {
inline bool Position::move_is_deep_pawn_push(Move m) const {
Color c = side_to_move();
- return piece_on(move_from(m)) == pawn_of_color(c)
+ return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN)
&& relative_rank(c, move_to(m)) > RANK_4;
}
inline bool Position::move_is_pawn_push_to_7th(Move m) const {
Color c = side_to_move();
- return piece_on(move_from(m)) == pawn_of_color(c)
+ return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN)
&& relative_rank(c, move_to(m)) == RANK_7;
}
inline bool Position::move_is_passed_pawn_push(Move m) const {
Color c = side_to_move();
- return piece_on(move_from(m)) == pawn_of_color(c)
+ return piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN)
&& pawn_is_passed(c, move_to(m));
}
inline bool Position::move_was_passed_pawn_push(Move m) const {
Color c = opposite_color(side_to_move());
- return piece_on(move_to(m)) == pawn_of_color(c)
+ return piece_on(move_to(m)) == piece_of_color_and_type(c, PAWN)
&& pawn_is_passed(c, move_to(m));
}
@@ -684,7 +707,7 @@ inline int Position::rule_50_counter() const {
inline bool Position::opposite_colored_bishops() const {
return piece_count(WHITE, BISHOP) == 1
- && piece_count(BLACK, BISHOP) == 1
+ && piece_count(BLACK, BISHOP) == 1
&& square_color(piece_list(WHITE, BISHOP, 0)) != square_color(piece_list(BLACK, BISHOP, 0));
}
@@ -692,6 +715,6 @@ inline bool Position::has_pawn_on_7th(Color c) const {
return pawns(c) & relative_rank_bb(c, RANK_7);
}
-
+
#endif // !defined(POSITION_H_INCLUDED)