////
/// FEN string for the initial position
-const std::string StartPosition = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
+const std::string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
/// Maximum number of plies per game (220 should be enough, because the
/// maximum search depth is 100, and during position setup we reset the
struct CheckInfo {
- CheckInfo(const Position&);
+ explicit CheckInfo(const Position&);
Bitboard dcCandidates;
Bitboard checkSq[8];
struct StateInfo {
Key pawnKey, materialKey;
- int castleRights, rule50, ply, pliesFromNull;
+ int castleRights, rule50, gamePly, pliesFromNull;
Square epSquare;
Score value;
Value npMaterial[2];
friend class MaterialInfo;
friend class EndgameFunctions;
+ Position(); // No default or copy c'tor allowed
+ Position(const Position& pos);
+
public:
enum GamePhase {
MidGame,
};
// Constructors
- Position();
- explicit Position(const Position& pos);
- explicit Position(const std::string& fen);
+ explicit Position(int threadID);
+ Position(const Position& pos, int threadID);
+ Position(const std::string& fen, int threadID);
// Text input/output
void from_fen(const std::string& fen);
// Incremental evaluation
Score value() const;
Value non_pawn_material(Color c) const;
- Score pst_delta(Piece piece, Square from, Square to) const;
+ static Score pst_delta(Piece piece, Square from, Square to);
// Game termination checks
bool is_mate() const;
// Number of plies since the last non-reversible move
int rule_50_counter() const;
+ int startpos_ply_counter() const;
+
// Other properties of the position
bool opposite_colored_bishops() const;
bool has_pawn_on_7th(Color c) const;
- // Game ply information
- int ply() const;
- void reset_ply();
+ // Current thread ID searching on the position
+ int thread() const;
+
+ // Reset the gamePly variable to 0
+ void reset_game_ply();
+
+ void inc_startpos_ply_counter();
// Position consistency check, for debugging
bool is_ok(int* failedStep = NULL) const;
void put_piece(Piece p, Square s);
void allow_oo(Color c);
void allow_ooo(Color c);
+ bool set_castling_rights(char token);
// Helper functions for doing and undoing moves
void do_capture_move(Key& key, PieceType capture, Color them, Square to, bool ep);
Key compute_material_key() const;
// Computing incremental evaluation scores and material counts
- Score pst(Color c, PieceType pt, Square s) const;
+ static Score pst(Color c, PieceType pt, Square s);
Score compute_value() const;
Value compute_non_pawn_material(Color c) const;
int castleRightsMask[64];
StateInfo startState;
File initialKFile, initialKRFile, initialQRFile;
+ int startPosPlyCounter;
+ int threadID;
StateInfo* st;
// Static variables
}
inline bool Position::square_is_empty(Square s) const {
- return piece_on(s) == EMPTY;
+ return piece_on(s) == NO_PIECE;
}
inline bool Position::square_is_occupied(Square s) const {
return st->materialKey;
}
-inline Score Position::pst(Color c, PieceType pt, Square s) const {
+inline Score Position::pst(Color c, PieceType pt, Square s) {
return PieceSquareTable[piece_of_color_and_type(c, pt)][s];
}
-inline Score Position::pst_delta(Piece piece, Square from, Square to) const {
+inline Score Position::pst_delta(Piece piece, Square from, Square to) {
return PieceSquareTable[piece][to] - PieceSquareTable[piece][from];
}
return st->rule50;
}
+inline int Position::startpos_ply_counter() const {
+
+ return startPosPlyCounter;
+}
+
inline bool Position::opposite_colored_bishops() const {
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));
+ && !same_color_squares(piece_list(WHITE, BISHOP, 0), piece_list(BLACK, BISHOP, 0));
}
inline bool Position::has_pawn_on_7th(Color c) const {
return st->capture;
}
-inline int Position::ply() const {
- return st->ply;
+inline int Position::thread() const {
+ return threadID;
}
#endif // !defined(POSITION_H_INCLUDED)