X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftypes.h;h=3ff07ee7f1f2681df4dd465050fc2098c3ae4844;hp=9bfe9a4c2e18ce298590436206666beac36b022d;hb=222f59b9c1537f22db65c6104072f5e0f68c1fbc;hpb=43973f43c660fb5543bd5ab019901df7055d9997 diff --git a/src/types.h b/src/types.h index 9bfe9a4c..3ff07ee7 100644 --- a/src/types.h +++ b/src/types.h @@ -136,7 +136,7 @@ enum CastlingSide { KING_SIDE, QUEEN_SIDE, CASTLING_SIDE_NB = 2 }; -enum CastlingRight { // Defined as in PolyGlot book hash key +enum CastlingRight { NO_CASTLING, WHITE_OO, WHITE_OOO = WHITE_OO << 1, @@ -211,14 +211,14 @@ enum Piece { enum Depth { - ONE_PLY = 2, + ONE_PLY = 1, - DEPTH_ZERO = 0 * ONE_PLY, - DEPTH_QS_CHECKS = 0 * ONE_PLY, - DEPTH_QS_NO_CHECKS = -1 * ONE_PLY, - DEPTH_QS_RECAPTURES = -5 * ONE_PLY, + DEPTH_ZERO = 0, + DEPTH_QS_CHECKS = 0, + DEPTH_QS_NO_CHECKS = -1, + DEPTH_QS_RECAPTURES = -5, - DEPTH_NONE = -127 * ONE_PLY + DEPTH_NONE = -6 }; enum Square { @@ -326,6 +326,8 @@ inline Score operator/(Score s, int i) { return make_score(mg_value(s) / i, eg_value(s) / i); } +CACHE_LINE_ALIGNMENT + extern Value PieceValue[PHASE_NB][PIECE_NB]; struct ExtMove { @@ -403,14 +405,6 @@ inline bool opposite_colors(Square s1, Square s2) { return ((s >> 3) ^ s) & 1; } -inline char to_char(File f, bool tolower = true) { - return char(f - FILE_A + (tolower ? 'a' : 'A')); -} - -inline char to_char(Rank r) { - return char(r - RANK_1 + '1'); -} - inline Square pawn_push(Color c) { return c == WHITE ? DELTA_N : DELTA_S; } @@ -444,11 +438,4 @@ inline bool is_ok(Move m) { return from_sq(m) != to_sq(m); // Catches also MOVE_NULL and MOVE_NONE } -#include - -inline const std::string to_string(Square s) { - char ch[] = { to_char(file_of(s)), to_char(rank_of(s)), 0 }; - return ch; -} - #endif // #ifndef TYPES_H_INCLUDED