X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=20c56ad3819b5417c6ae482750334a1e0a475d60;hp=4dcbbf76ec80b24531fe414820fb7fe0781f8dc4;hb=c97104e8540b72ee2c6c9c13d3773d2c0f9ec32f;hpb=8b5519a009914b07ad73a71f86dc0e9ff52b99da
diff --git a/src/position.h b/src/position.h
index 4dcbbf76..20c56ad3 100644
--- a/src/position.h
+++ b/src/position.h
@@ -1,17 +1,18 @@
/*
- Glaurung, a UCI chess playing engine.
- Copyright (C) 2004-2008 Tord Romstad
+ Stockfish, a UCI chess playing engine derived from Glaurung 2.1
+ Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+ Copyright (C) 2008 Marco Costalba
- Glaurung is free software: you can redistribute it and/or modify
+ Stockfish is free software: you can redistribute it and/or modify
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.
-
- Glaurung is distributed in the hope that it will be useful,
+
+ 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 .
*/
@@ -24,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
////
@@ -47,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
@@ -63,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
@@ -91,7 +92,7 @@ struct UndoInfo {
/// 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
@@ -116,6 +117,7 @@ struct UndoInfo {
class Position {
friend class MaterialInfo;
+ friend class EndgameFunctions;
public:
// Constructors
@@ -126,7 +128,7 @@ public:
// Text input/output
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);
@@ -171,19 +173,14 @@ public:
// Number of pieces of each color and type
int piece_count(Color c, PieceType pt) const;
- int pawn_count(Color c) const;
- int knight_count(Color c) const;
- int bishop_count(Color c) const;
- int rook_count(Color c) const;
- int queen_count(Color c) 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;
@@ -213,8 +210,7 @@ public:
Bitboard attacks_to(Square s) const;
Bitboard attacks_to(Square s, Color c) const;
bool is_check() const;
- bool white_pawn_attacks_square(Square f, Square t) const;
- bool black_pawn_attacks_square(Square f, Square t) const;
+ bool pawn_attacks_square(Color c, Square f, Square t) const;
template
Bitboard piece_attacks_square(Square f, Square t) const; // Dispatch at compile-time
@@ -222,8 +218,8 @@ public:
bool piece_attacks_square(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 pl_move_is_legal(Move m, Bitboard pinned) const;
bool move_is_check(Move m) const;
bool move_is_check(Move m, Bitboard dcCandidates) const;
bool move_is_capture(Move m) const;
@@ -257,6 +253,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;
@@ -286,7 +283,7 @@ public:
// Reset the gamePly variable to 0
void reset_game_ply();
-
+
// Position consistency check, for debugging
bool is_ok(int* failedStep = NULL) const;
@@ -302,6 +299,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);
@@ -310,6 +308,9 @@ private:
void undo_ep_move(Move m);
void find_checkers();
+ template
+ Bitboard hidden_checks(Color c, Square ksq) const;
+
// Computing hash keys from scratch (for initialization and debugging)
Key compute_key() const;
Key compute_pawn_key() const;
@@ -331,7 +332,7 @@ private:
// Piece counts
int pieceCount[2][8]; // [color][pieceType]
-
+
// Piece lists
Square pieceList[2][8][16]; // [color][pieceType][index]
int index[64];
@@ -492,26 +493,6 @@ inline int Position::piece_count(Color c, PieceType pt) const {
return pieceCount[c][pt];
}
-inline int Position::pawn_count(Color c) const {
- return piece_count(c, PAWN);
-}
-
-inline int Position::knight_count(Color c) const {
- return piece_count(c, KNIGHT);
-}
-
-inline int Position::bishop_count(Color c) const {
- return piece_count(c, BISHOP);
-}
-
-inline int Position::rook_count(Color c) const {
- return piece_count(c, ROOK);
-}
-
-inline int Position::queen_count(Color c) const {
- return piece_count(c, QUEEN);
-}
-
inline Square Position::piece_list(Color c, PieceType pt, int index) const {
return pieceList[c][pt][index];
}
@@ -578,15 +559,11 @@ inline Bitboard Position::checkers() const {
}
inline bool Position::is_check() const {
- return checkers() != EmptyBoardBB;
+ return checkersBB != EmptyBoardBB;
}
-inline bool Position::white_pawn_attacks_square(Square f, Square t) const {
- return bit_is_set(pawn_attacks(WHITE, f), t);
-}
-
-inline bool Position::black_pawn_attacks_square(Square f, Square t) const {
- return bit_is_set(pawn_attacks(BLACK, f), t);
+inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const {
+ return bit_is_set(pawn_attacks(c, f), t);
}
template
@@ -617,7 +594,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;
}
@@ -668,7 +645,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)
@@ -712,8 +689,8 @@ inline int Position::rule_50_counter() const {
inline bool Position::opposite_colored_bishops() const {
- return bishop_count(WHITE) == 1
- && bishop_count(BLACK) == 1
+ 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));
}
@@ -721,6 +698,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)