X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=841c794ad0b87691043b7d3a58c692b6fdb8d5f5;hp=623e51d9856570b713e69431d121378d0f1e2c61;hb=bb3427ca85bdb20b4c8af12b63f635d03c5e9146;hpb=5ea08e79c4e510b65b3e18c9ab09919132976eec diff --git a/src/types.h b/src/types.h index 623e51d9..841c794a 100644 --- a/src/types.h +++ b/src/types.h @@ -46,9 +46,6 @@ typedef unsigned __int64 uint64_t; #endif -#define Min(x, y) (((x) < (y)) ? (x) : (y)) -#define Max(x, y) (((x) < (y)) ? (y) : (x)) - //// //// Configuration //// @@ -158,6 +155,9 @@ const bool CpuIs64Bit = false; typedef uint64_t Key; typedef uint64_t Bitboard; +const int PLY_MAX = 100; +const int PLY_MAX_PLUS_2 = PLY_MAX + 2; + enum ValueType { VALUE_TYPE_NONE = 0, VALUE_TYPE_UPPER = 1, @@ -172,6 +172,10 @@ enum Value { VALUE_MATE = 30000, VALUE_INFINITE = 30001, VALUE_NONE = 30002, + + VALUE_MATE_IN_PLY_MAX = VALUE_MATE - PLY_MAX, + VALUE_MATED_IN_PLY_MAX = -VALUE_MATE + PLY_MAX, + VALUE_ENSURE_INTEGER_SIZE_P = INT_MAX, VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN }; @@ -194,9 +198,10 @@ enum Depth { ONE_PLY = 2, - DEPTH_ZERO = 0 * ONE_PLY, - DEPTH_QS_CHECKS = -1 * ONE_PLY, - DEPTH_QS_NO_CHECKS = -2 * ONE_PLY, + DEPTH_ZERO = 0 * ONE_PLY, + DEPTH_QS_CHECKS = -1 * ONE_PLY, + DEPTH_QS_NO_CHECKS = -2 * ONE_PLY, + DEPTH_QS_RECAPTURES = -4 * ONE_PLY, DEPTH_NONE = -127 * ONE_PLY }; @@ -244,6 +249,15 @@ enum ScaleFactor { SCALE_FACTOR_NONE = 255 }; +enum CastleRight { + CASTLES_NONE = 0, + WHITE_OO = 1, + BLACK_OO = 2, + WHITE_OOO = 4, + BLACK_OOO = 8, + ALL_CASTLES = 15 +}; + /// Score enum keeps a midgame and an endgame value in a single /// integer (enum), first LSB 16 bits are used to store endgame @@ -288,7 +302,7 @@ inline Value operator- (Value v, int i) { return Value(int(v) - i); } // Extracting the _signed_ lower and upper 16 bits it not so trivial // because according to the standard a simple cast to short is // implementation defined and so is a right shift of a signed integer. -inline Value mg_value(Score s) { return Value(((int(s) + 32768) & ~0xffff) / 0x10000); } +inline Value mg_value(Score s) { return Value(((s + 32768) & ~0xffff) / 0x10000); } // Unfortunatly on Intel 64 bit we have a small speed regression, so use a faster code in // this case, although not 100% standard compliant it seems to work for Intel and MSVC. @@ -329,6 +343,10 @@ const Value RookValueEndgame = Value(0x4FE); const Value QueenValueMidgame = Value(0x9D9); const Value QueenValueEndgame = Value(0x9FE); +extern const Value PieceValueMidgame[17]; +extern const Value PieceValueEndgame[17]; +extern int SquareDistance[64][64]; + inline Value value_mate_in(int ply) { return VALUE_MATE - ply; } @@ -338,122 +356,97 @@ inline Value value_mated_in(int ply) { } inline Piece make_piece(Color c, PieceType pt) { - return Piece((int(c) << 3) | int(pt)); + return Piece((c << 3) | pt); } -inline PieceType type_of_piece(Piece p) { - return PieceType(int(p) & 7); +inline PieceType type_of(Piece p) { + return PieceType(p & 7); } -inline Color color_of_piece(Piece p) { - return Color(int(p) >> 3); +inline Color color_of(Piece p) { + return Color(p >> 3); } -inline Color opposite_color(Color c) { - return Color(int(c) ^ 1); +inline Color flip(Color c) { + return Color(c ^ 1); } -inline bool color_is_ok(Color c) { - return c == WHITE || c == BLACK; -} - -inline bool piece_type_is_ok(PieceType pt) { - return pt >= PAWN && pt <= KING; -} - -inline bool piece_is_ok(Piece p) { - return piece_type_is_ok(type_of_piece(p)) && color_is_ok(color_of_piece(p)); -} - -inline char piece_type_to_char(PieceType pt) { - static const char ch[] = " PNBRQK"; - return ch[pt]; +inline Square make_square(File f, Rank r) { + return Square((r << 3) | f); } -inline Square make_square(File f, Rank r) { - return Square((int(r) << 3) | int(f)); +inline bool square_is_ok(Square s) { + return s >= SQ_A1 && s <= SQ_H8; } -inline File square_file(Square s) { - return File(int(s) & 7); +inline File file_of(Square s) { + return File(s & 7); } -inline Rank square_rank(Square s) { - return Rank(int(s) >> 3); +inline Rank rank_of(Square s) { + return Rank(s >> 3); } -inline Square flip_square(Square s) { - return Square(int(s) ^ 56); +inline Square flip(Square s) { + return Square(s ^ 56); } -inline Square flop_square(Square s) { - return Square(int(s) ^ 7); +inline Square mirror(Square s) { + return Square(s ^ 7); } inline Square relative_square(Color c, Square s) { - return Square(int(s) ^ (int(c) * 56)); + return Square(s ^ (c * 56)); } inline Rank relative_rank(Color c, Rank r) { - return Rank(int(r) ^ (int(c) * 7)); + return Rank(r ^ (c * 7)); } inline Rank relative_rank(Color c, Square s) { - return relative_rank(c, square_rank(s)); + return relative_rank(c, rank_of(s)); } -inline SquareColor square_color(Square s) { - return SquareColor(int(square_rank(s) + s) & 1); +inline SquareColor color_of(Square s) { + return SquareColor(int(rank_of(s) + s) & 1); } -inline bool opposite_color_squares(Square s1, Square s2) { - int s = int(s1) ^ int(s2); +inline bool opposite_colors(Square s1, Square s2) { + int s = s1 ^ s2; return ((s >> 3) ^ s) & 1; } inline int file_distance(Square s1, Square s2) { - return abs(square_file(s1) - square_file(s2)); + return abs(file_of(s1) - file_of(s2)); } inline int rank_distance(Square s1, Square s2) { - return abs(square_rank(s1) - square_rank(s2)); + return abs(rank_of(s1) - rank_of(s2)); } inline int square_distance(Square s1, Square s2) { - return Max(file_distance(s1, s2), rank_distance(s1, s2)); + return SquareDistance[s1][s2]; } -inline File file_from_char(char c) { - return File(c - 'a') + FILE_A; +inline char piece_type_to_char(PieceType pt) { + return " PNBRQK"[pt]; } inline char file_to_char(File f) { return char(f - FILE_A + int('a')); } -inline Rank rank_from_char(char c) { - return Rank(c - '1') + RANK_1; -} - inline char rank_to_char(Rank r) { return char(r - RANK_1 + int('1')); } inline const std::string square_to_string(Square s) { - char ch[] = { file_to_char(square_file(s)), rank_to_char(square_rank(s)), 0 }; - return std::string(ch); + char ch[] = { file_to_char(file_of(s)), rank_to_char(rank_of(s)), 0 }; + return ch; } -inline bool file_is_ok(File f) { - return f >= FILE_A && f <= FILE_H; -} - -inline bool rank_is_ok(Rank r) { - return r >= RANK_1 && r <= RANK_8; -} - -inline bool square_is_ok(Square s) { - return s >= SQ_A1 && s <= SQ_H8; +inline Square pawn_push(Color c) { + return c == WHITE ? DELTA_N : DELTA_S; } #endif // !defined(TYPES_H_INCLUDED)