X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=4854b29dcf876dcf64d98c08ff1e8cc69784c85d;hp=88090ad2227232394e9a5ce81cbb6fb6fe9535d8;hb=839088205edd88eee9852c21442424cc66941ccb;hpb=b50dc1647fa70178d09beb529815cb565f9774c0 diff --git a/src/position.h b/src/position.h index 88090ad2..4854b29d 100644 --- a/src/position.h +++ b/src/position.h @@ -51,7 +51,7 @@ //// /// 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 @@ -258,7 +258,7 @@ public: // 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; @@ -294,6 +294,7 @@ private: 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); @@ -310,7 +311,7 @@ private: 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; @@ -507,11 +508,11 @@ inline Key Position::get_material_key() 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]; }