// Forcing value to bool 'true' or 'false' (performance warning)
#pragma warning(disable: 4800)
+// Conditional expression is constant
+#pragma warning(disable: 4127)
+
+
#endif
////
#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
+/// 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 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.
+/// is made on the board (by calling Position::do_move), an StateInfo object
+/// must be passed as a parameter.
-struct UndoInfo {
- Bitboard pinners[2], pinned[2], dcCandidates[2], checkersBB;
+struct StateInfo {
Key key, pawnKey, materialKey;
int castleRights, rule50;
Square epSquare;
- Move lastMove;
Value mgValue, egValue;
+
PieceType capture;
+ Bitboard checkersBB;
+ Move lastMove;
+ StateInfo* previous;
};
// Properties of moves
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;
bool move_is_deep_pawn_push(Move m) const;
bool move_is_pawn_push_to_7th(Move m) const;
bool square_is_weak(Square s, Color c) const;
// Doing and undoing moves
- void do_move(Move m, UndoInfo &u);
- 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;
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_capture_move(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>
void update_checkers(Bitboard* pCheckersBB, Square ksq, Square from, Square to, Bitboard dcCandidates);
- template<PieceType Piece, bool FindPinned>
- Bitboard hidden_checks(Color c, Square ksq, Bitboard& pinners) const;
+ template<bool FindPinned>
+ Bitboard hidden_checkers(Color c) const;
// Computing hash keys from scratch (for initialization and debugging)
Key compute_key() const;
Key history[MaxGameLength];
Value npMaterial[2];
File initialKFile, initialKRFile, initialQRFile;
-
- // Info backed up in do_move()
- union {
- UndoInfo undoInfoUnion;
- struct { // Must have the same layout of UndoInfo
- mutable Bitboard pinners[2], pinned[2], dcCandidates[2];
- Bitboard checkersBB;
- Key key, pawnKey, materialKey;
- int castleRights, rule50;
- Square epSquare;
- Move lastMove;
- Value mgValue, egValue;
- PieceType capture;
- };
- };
+ 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::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 {
}
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;
}
template<Position::GamePhase Phase>
}
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 int Position::rule_50_counter() const {
- return rule50;
+ return st->rule50;
}
inline bool Position::opposite_colored_bishops() const {
projects / stockfish / blobdiff