X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvalue.h;h=2edb4a00452c927468c9d46b7e28aaf1ba947db7;hb=29076043e073c3d6e3b90b0809afc2a0af57e5e1;hp=f4db35e5d2a9583c517f4624ddf503e22918ecc1;hpb=391e176274ecf39ea76550f443ae302687eeaf71;p=stockfish
diff --git a/src/value.h b/src/value.h
index f4db35e5..2edb4a00 100644
--- a/src/value.h
+++ b/src/value.h
@@ -17,25 +17,18 @@
along with this program. If not, see .
*/
-
#if !defined(VALUE_H_INCLUDED)
#define VALUE_H_INCLUDED
-////
-//// Includes
-////
-
-#include "piece.h"
+#include
+#include "types.h"
-////
-//// Types
-////
enum ValueType {
VALUE_TYPE_NONE = 0,
- VALUE_TYPE_UPPER = 1, // Upper bound
- VALUE_TYPE_LOWER = 2, // Lower bound
+ VALUE_TYPE_UPPER = 1,
+ VALUE_TYPE_LOWER = 2,
VALUE_TYPE_EXACT = VALUE_TYPE_UPPER | VALUE_TYPE_LOWER
};
@@ -47,10 +40,15 @@ enum Value {
VALUE_MATE = 30000,
VALUE_INFINITE = 30001,
VALUE_NONE = 30002,
- VALUE_ENSURE_SIGNED = -1
+ VALUE_ENSURE_INTEGER_SIZE_P = INT_MAX,
+ VALUE_ENSURE_INTEGER_SIZE_N = INT_MIN
};
-ENABLE_OPERATORS_ON(Value);
+ENABLE_OPERATORS_ON(Value)
+
+// Extra operators
+inline Value operator+ (Value v, int i) { return Value(int(v) + i); }
+inline Value operator- (Value v, int i) { return Value(int(v) - i); }
enum ScaleFactor {
@@ -69,13 +67,10 @@ enum ScaleFactor {
// its data, so ensure Score to be an integer type.
enum Score {
SCORE_ZERO = 0,
- SCORE_ENSURE_32_BITS_SIZE_P = (1 << 16),
- SCORE_ENSURE_32_BITS_SIZE_N = -(1 << 16)
+ SCORE_ENSURE_INTEGER_SIZE_P = INT_MAX,
+ SCORE_ENSURE_INTEGER_SIZE_N = INT_MIN
};
-ENABLE_OPERATORS_ON(Score);
-
-
// 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.
@@ -98,62 +93,16 @@ inline Score operator/(Score s, int i) { return make_score(mg_value(s) / i, eg_v
// a very high risk of overflow. So user should explicitly convert to integer.
inline Score operator*(Score s1, Score s2);
-
-////
-//// Constants and variables
-////
-
-/// Piece values, middle game and endgame
-
-/// Important: If the material values are changed, one must also
-/// adjust the piece square tables, and the method game_phase() in the
-/// Position class!
-///
-/// Values modified by Joona Kiiski
-
-const Value PawnValueMidgame = Value(0x0C6);
-const Value PawnValueEndgame = Value(0x102);
-const Value KnightValueMidgame = Value(0x331);
-const Value KnightValueEndgame = Value(0x34E);
-const Value BishopValueMidgame = Value(0x344);
-const Value BishopValueEndgame = Value(0x359);
-const Value RookValueMidgame = Value(0x4F6);
-const Value RookValueEndgame = Value(0x4FE);
-const Value QueenValueMidgame = Value(0x9D9);
-const Value QueenValueEndgame = Value(0x9FE);
-
-const Value PieceValueMidgame[17] = {
- VALUE_ZERO,
- PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
- RookValueMidgame, QueenValueMidgame,
- VALUE_ZERO, VALUE_ZERO, VALUE_ZERO,
- PawnValueMidgame, KnightValueMidgame, BishopValueMidgame,
- RookValueMidgame, QueenValueMidgame,
- VALUE_ZERO, VALUE_ZERO, VALUE_ZERO
-};
-
-const Value PieceValueEndgame[17] = {
- VALUE_ZERO,
- PawnValueEndgame, KnightValueEndgame, BishopValueEndgame,
- RookValueEndgame, QueenValueEndgame,
- VALUE_ZERO, VALUE_ZERO, VALUE_ZERO,
- PawnValueEndgame, KnightValueEndgame, BishopValueEndgame,
- RookValueEndgame, QueenValueEndgame,
- VALUE_ZERO, VALUE_ZERO, VALUE_ZERO
-};
-
-/// Bonus for having the side to move (modified by Joona Kiiski)
-
-const Score TempoValue = make_score(48, 22);
-
-
-////
-//// Inline functions
-////
-
-inline Value operator+ (Value v, int i) { return Value(int(v) + i); }
-inline Value operator- (Value v, int i) { return Value(int(v) - i); }
-
+// Remaining operators are standard
+inline Score operator+ (const Score d1, const Score d2) { return Score(int(d1) + int(d2)); }
+inline Score operator- (const Score d1, const Score d2) { return Score(int(d1) - int(d2)); }
+inline Score operator* (int i, const Score d) { return Score(i * int(d)); }
+inline Score operator* (const Score d, int i) { return Score(int(d) * i); }
+inline Score operator- (const Score d) { return Score(-int(d)); }
+inline void operator+= (Score& d1, const Score d2) { d1 = d1 + d2; }
+inline void operator-= (Score& d1, const Score d2) { d1 = d1 - d2; }
+inline void operator*= (Score& d, int i) { d = Score(int(d) * i); }
+inline void operator/= (Score& d, int i) { d = Score(int(d) / i); }
inline Value value_mate_in(int ply) {
return VALUE_MATE - ply;
@@ -163,12 +112,4 @@ inline Value value_mated_in(int ply) {
return -VALUE_MATE + ply;
}
-inline int is_upper_bound(ValueType vt) {
- return vt & VALUE_TYPE_UPPER;
-}
-
-inline int is_lower_bound(ValueType vt) {
- return vt & VALUE_TYPE_LOWER;
-}
-
#endif // !defined(VALUE_H_INCLUDED)