#include "direction.h"
#include "move.h"
#include "piece.h"
-#include "phase.h"
#include "square.h"
#include "value.h"
//// Types
////
-/// Castle rights, encoded as bit fields:
+/// Castle rights, encoded as bit fields
enum CastleRights {
NO_CASTLES = 0,
ALL_CASTLES = 15
};
+/// Game phase
+enum Phase {
+ PHASE_ENDGAME = 0,
+ PHASE_MIDGAME = 128
+};
+
-/// The UndoInfo struct stores information we need 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), an UndoInfo object
-/// must be passed as a parameter. When the move is unmade (by calling
-/// Position::undo_move), the same UndoInfo object must be passed again.
+/// The StateInfo struct stores information we need 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), an StateInfo object
+/// must be passed as a parameter.
-struct UndoInfo {
- int castleRights;
+struct StateInfo {
+ Key key, pawnKey, materialKey;
+ int castleRights, rule50;
Square epSquare;
+ Value mgValue, egValue;
+
+ PieceType capture;
Bitboard checkersBB;
- Key key, pawnKey, materialKey;
- int rule50;
Move lastMove;
- PieceType capture;
- Value mgValue, egValue;
+ StateInfo* previous;
};
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);
// 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;
// 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
template<PieceType>
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 pl_move_is_legal(Move m) const;
bool square_is_weak(Square s, Color c) const;
// Doing and undoing moves
- 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);
+ void setStartState(const StateInfo& st);
+ void do_move(Move m, StateInfo& st);
+ void do_move(Move m, StateInfo& st, Bitboard dcCandidates);
+ void undo_move(Move m);
+ void do_null_move(StateInfo& st);
+ void undo_null_move();
// 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;
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
static void init_piece_square_tables();
private:
+
// Initialization helper functions (used while setting up a position)
void clear();
void put_piece(Piece p, Square s);
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_promotion_move(Move m);
void do_ep_move(Move m);
void undo_castle_move(Move m);
- void undo_promotion_move(Move m, const UndoInfo &u);
+ void undo_promotion_move(Move m);
void undo_ep_move(Move m);
void find_checkers();
- template<PieceType Piece, bool FindPinned>
- Bitboard hidden_checks(Color c, Square ksq) const;
+ template<PieceType Piece>
+ void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates);
+
+ template<bool FindPinned>
+ Bitboard hidden_checkers(Color c) const;
// Computing hash keys from scratch (for initialization and debugging)
Key compute_key() const;
Key compute_material_key() const;
// Computing incremental evaluation scores and material counts
- Value mg_pst(Color c, PieceType pt, Square s) const;
- Value eg_pst(Color c, PieceType pt, Square s) const;
- Value compute_mg_value() const;
- Value compute_eg_value() const;
+ enum GamePhase {
+ MidGame,
+ EndGame
+ };
+ template<GamePhase> Value pst(Color c, PieceType pt, Square s) const;
+ template<GamePhase> Value compute_value() const;
Value compute_non_pawn_material(Color c) const;
// Bitboards
Bitboard byColorBB[2], byTypeBB[8];
- Bitboard checkersBB;
// Board
Piece board[64];
int index[64];
// Other info
- Color sideToMove;
- int castleRights;
- File initialKFile, initialKRFile, initialQRFile;
- Square epSquare;
Square kingSquare[2];
- Move lastMove;
- Key key, pawnKey, materialKey, history[MaxGameLength];
- int rule50, gamePly;
- Value mgValue, egValue;
+ Color sideToMove;
+ int gamePly;
+ Key history[MaxGameLength];
Value npMaterial[2];
+ File initialKFile, initialKRFile, initialQRFile;
+ StateInfo startState;
+ StateInfo* st;
// Static variables
static int castleRightsMask[64];
}
inline Square Position::ep_square() const {
- return epSquare;
+ return st->epSquare;
}
inline Square Position::king_square(Color c) const {
}
inline bool Position::can_castle_kingside(Color side) const {
- return castleRights & (1+int(side));
+ return st->castleRights & (1+int(side));
}
inline bool Position::can_castle_queenside(Color side) const {
- return castleRights & (4+4*int(side));
+ return st->castleRights & (4+4*int(side));
}
inline bool Position::can_castle(Color side) 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<PAWN>(Square s) const {
+ return StepAttackBB[piece_of_color_and_type(opposite_color(sideToMove), PAWN)][s];
}
template<>
}
inline Bitboard Position::checkers() const {
- return checkersBB;
+ return st->checkersBB;
}
inline bool Position::is_check() const {
- return checkersBB != EmptyBoardBB;
+ return st->checkersBB != EmptyBoardBB;
}
inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const {
return bit_is_set(piece_attacks<Piece>(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));
}
}
inline Key Position::get_key() const {
- return key;
+ return st->key;
}
inline Key Position::get_pawn_key() const {
- return pawnKey;
+ return st->pawnKey;
}
inline Key Position::get_material_key() const {
- return materialKey;
+ return st->materialKey;
}
-inline Value Position::mg_pst(Color c, PieceType pt, Square s) const {
- return MgPieceSquareTable[piece_of_color_and_type(c, pt)][s];
+template<Position::GamePhase Phase>
+inline Value Position::pst(Color c, PieceType pt, Square s) const {
+ return (Phase == MidGame ? MgPieceSquareTable[piece_of_color_and_type(c, pt)][s]
+ : EgPieceSquareTable[piece_of_color_and_type(c, pt)][s]);
}
inline Value Position::mg_pst_delta(Move m) const {
-MgPieceSquareTable[piece_on(move_from(m))][move_from(m)];
}
-inline Value Position::eg_pst(Color c, PieceType pt, Square s) const {
- return EgPieceSquareTable[piece_of_color_and_type(c, pt)][s];
-}
-
inline Value Position::mg_value() const {
- return mgValue;
+ return st->mgValue;
}
inline Value Position::eg_value() const {
- return egValue;
+ return st->egValue;
}
inline Value Position::non_pawn_material(Color c) const {
inline Phase Position::game_phase() const {
- // The purpose of the Value(325) terms below is to make sure the difference
- // between MidgameLimit and EndgameLimit is a power of 2, which should make
- // the division at the end of the function a bit faster.
- static const Value MidgameLimit = 2 * QueenValueMidgame
- + 2 * RookValueMidgame
- + 6 * BishopValueMidgame
- + Value(325);
-
- static const Value EndgameLimit = 4 * RookValueMidgame - Value(325);
+ // Values modified by Joona Kiiski
+ static const Value MidgameLimit = Value(15713);
+ static const Value EndgameLimit = Value(4428);
Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK);
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));
}
inline int Position::rule_50_counter() const {
- return rule50;
+ return st->rule50;
}
inline bool Position::opposite_colored_bishops() const {
projects / stockfish / blobdiff