X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fvalue.h;h=ee093a6e13dcc32ea4ef8adb1ac972812c4498be;hp=b5f56c06b7caf0ce0136a42d891f5c17e31d7373;hb=06f06a9be8b888c540e95bbc35a84b541fef4a34;hpb=5c81602d14539f8259a715477315e28b5de7cb54

diff --git a/src/value.h b/src/value.h
index b5f56c06..ee093a6e 100644
--- a/src/value.h
+++ b/src/value.h
@@ -37,7 +37,9 @@ enum ValueType {
   VALUE_TYPE_UPPER = 1,  // Upper bound
   VALUE_TYPE_LOWER = 2,  // Lower bound
   VALUE_TYPE_EXACT = 3,  // Exact score
-  VALUE_TYPE_EVAL  = 4   // Evaluation cache
+  VALUE_TYPE_EVAL  = 4,  // Evaluation cache
+  VALUE_TYPE_EV_UP = 5,  // Evaluation cache for upper bound
+  VALUE_TYPE_EV_LO = 6   // Evaluation cache for lower bound
 };
 
 
@@ -50,6 +52,40 @@ enum Value {
 };
 
 
+/// Score struct keeps a midgame and an endgame value in a single
+/// ScoreValue 64 bit union.
+
+union ScoreValue {
+    int64_t v64;
+    struct {
+      int32_t mgv;
+      int32_t egv;
+    } v32;
+};
+
+struct Score {
+
+    Score() {}
+    Score(const Score& s) { v = s.v; }
+    Score(int mg, int eg) { v.v32.mgv = int32_t(mg); v.v32.egv = int32_t(eg); }
+
+    Score& operator=(const Score& s) { v = s.v; return *this; }
+    Score& operator+=(const Score& s) { v.v32.mgv += s.v.v32.mgv; v.v32.egv += s.v.v32.egv; return *this; }
+    Score& operator-=(const Score& s) { v.v32.mgv -= s.v.v32.mgv; v.v32.egv -= s.v.v32.egv; return *this; }
+
+    Value mg() const { return Value(v.v32.mgv); }
+    Value eg() const { return Value(v.v32.egv); }
+
+private:
+    ScoreValue v;
+};
+
+inline Score operator*(int i, Score s) { return Score(i * s.mg(), i * s.eg()); }
+inline Score operator*(Score s, int i) { return s * i; }
+inline Score operator-(Score s) { return Score(-s.mg(), -s.eg()); }
+
+extern std::ostream& operator<<(std::ostream& os, Score s);
+
 ////
 //// Constants and variables
 ////
@@ -62,16 +98,16 @@ enum Value {
 ///
 /// Values modified by Joona Kiiski
 
-const Value PawnValueMidgame   = Value(0x0CC);
-const Value PawnValueEndgame   = Value(0x101);
-const Value KnightValueMidgame = Value(0x332);
+const Value PawnValueMidgame   = Value(0x0C6);
+const Value PawnValueEndgame   = Value(0x102);
+const Value KnightValueMidgame = Value(0x331);
 const Value KnightValueEndgame = Value(0x34E);
-const Value BishopValueMidgame = Value(0x345);
-const Value BishopValueEndgame = Value(0x356);
-const Value RookValueMidgame   = Value(0x4F8);
-const Value RookValueEndgame   = Value(0x500);
-const Value QueenValueMidgame  = Value(0x9D5);
-const Value QueenValueEndgame  = Value(0x9FB);
+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(0),
@@ -93,10 +129,9 @@ const Value PieceValueEndgame[17] = {
   Value(0), Value(0), Value(0)
 };
 
-/// Bonus for having the side to move
+/// Bonus for having the side to move (modified by Joona Kiiski)
 
-const Value TempoValueMidgame = Value(48);
-const Value TempoValueEndgame = Value(21);
+const Score TempoValue = Score(48, 22);
 
 
 ////