X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fvalue.h;h=f4db35e5d2a9583c517f4624ddf503e22918ecc1;hp=d86a8bb90017126a02acbae20211107fc3a501ab;hb=391e176274ecf39ea76550f443ae302687eeaf71;hpb=a5ae7fe26030bdd73a95fde3ebe841abfe84ec5e diff --git a/src/value.h b/src/value.h index d86a8bb9..f4db35e5 100644 --- a/src/value.h +++ b/src/value.h @@ -68,8 +68,9 @@ enum ScaleFactor { // Compiler is free to choose the enum type as long as can keep // its data, so ensure Score to be an integer type. enum Score { - ENSURE_32_BITS_SIZE_P = (1 << 16), - ENSURE_32_BITS_SIZE_N = -(1 << 16) + SCORE_ZERO = 0, + SCORE_ENSURE_32_BITS_SIZE_P = (1 << 16), + SCORE_ENSURE_32_BITS_SIZE_N = -(1 << 16) }; ENABLE_OPERATORS_ON(Score); @@ -162,28 +163,12 @@ inline Value value_mated_in(int ply) { return -VALUE_MATE + ply; } -inline bool is_upper_bound(ValueType vt) { - return (int(vt) & int(VALUE_TYPE_UPPER)) != 0; +inline int is_upper_bound(ValueType vt) { + return vt & VALUE_TYPE_UPPER; } -inline bool is_lower_bound(ValueType vt) { - return (int(vt) & int(VALUE_TYPE_LOWER)) != 0; -} - -inline Value piece_value_midgame(PieceType pt) { - return PieceValueMidgame[pt]; -} - -inline Value piece_value_endgame(PieceType pt) { - return PieceValueEndgame[pt]; -} - -inline Value piece_value_midgame(Piece p) { - return PieceValueMidgame[p]; -} - -inline Value piece_value_endgame(Piece p) { - return PieceValueEndgame[p]; +inline int is_lower_bound(ValueType vt) { + return vt & VALUE_TYPE_LOWER; } #endif // !defined(VALUE_H_INCLUDED)