Move Tempo to evaluation

No functional change.

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 804e1dd780dc58c033aaf87f7fec503b71d5b4ba..bea0e306388ffed3864091372247f003b55af9b9 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -855,7 +855,7 @@ namespace Eval {
   /// of the position always from the point of view of the side to move.
 
   Value evaluate(const Position& pos) {
-    return do_evaluate<false>(pos);
+    return do_evaluate<false>(pos) + Tempo;
   }
 
 

diff --git a/src/evaluate.h b/src/evaluate.h
index 73df76a9fb830f79cff39af6a5202e8bdadbd67e..eb323b4c6d8907c5f34a5da3b6bcd37ba84036e8 100644 (file)
--- a/src/evaluate.h
+++ b/src/evaluate.h
@@ -26,6 +26,8 @@ class Position;
 
 namespace Eval {
 
+const int Tempo = 17; // Must be visible to search
+
 extern void init();
 extern Value evaluate(const Position& pos);
 extern std::string trace(const Position& pos);

diff --git a/src/search.cpp b/src/search.cpp
index 37a962663fd241434642d09c89c760682483a8b1..529345e960f1159e53acb5c2c15ea9a7cc7042e6 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -76,9 +76,6 @@ namespace {
     return (Depth) Reductions[PvNode][i][std::min(int(d) / ONE_PLY, 63)][std::min(mn, 63)];
   }
 
-  // Tempo bonus. Must be handled by search to preserve eval symmetry.
-  const int Tempo = 17;
-
   size_t MultiPV, PVIdx;
   TimeManager TimeMgr;
   double BestMoveChanges;
@@ -484,7 +481,7 @@ namespace {
     {
         // Step 2. Check for aborted search and immediate draw
         if (Signals.stop || pos.is_draw() || ss->ply > MAX_PLY)
-            return ss->ply > MAX_PLY && !inCheck ? evaluate(pos) + Tempo : DrawValue[pos.side_to_move()];
+            return ss->ply > MAX_PLY && !inCheck ? evaluate(pos) : DrawValue[pos.side_to_move()];
 
         // Step 3. Mate distance pruning. Even if we mate at the next move our score
         // would be at best mate_in(ss->ply+1), but if alpha is already bigger because
@@ -539,7 +536,7 @@ namespace {
     {
         // Never assume anything on values stored in TT
         if ((ss->staticEval = eval = tte->eval_value()) == VALUE_NONE)
-            eval = ss->staticEval = evaluate(pos) + Tempo;
+            eval = ss->staticEval = evaluate(pos);
 
         // Can ttValue be used as a better position evaluation?
         if (ttValue != VALUE_NONE)
@@ -548,7 +545,7 @@ namespace {
     }
     else
     {
-        eval = ss->staticEval = ss->nullChild ? -(ss-1)->staticEval + 2 * Tempo : evaluate(pos) + Tempo;
+        eval = ss->staticEval = ss->nullChild ? -(ss-1)->staticEval + 2 * Eval::Tempo : evaluate(pos);
         TT.store(posKey, VALUE_NONE, BOUND_NONE, DEPTH_NONE, MOVE_NONE, ss->staticEval);
     }
 
@@ -1066,7 +1063,7 @@ moves_loop: // When in check and at SpNode search starts from here
 
     // Check for an instant draw or if the maximum ply has been reached
     if (pos.is_draw() || ss->ply > MAX_PLY)
-        return ss->ply > MAX_PLY && !InCheck ? evaluate(pos) + Tempo : DrawValue[pos.side_to_move()];
+        return ss->ply > MAX_PLY && !InCheck ? evaluate(pos) : DrawValue[pos.side_to_move()];
 
     // Decide whether or not to include checks: this fixes also the type of
     // TT entry depth that we are going to use. Note that in qsearch we use
@@ -1103,7 +1100,7 @@ moves_loop: // When in check and at SpNode search starts from here
         {
             // Never assume anything on values stored in TT
             if ((ss->staticEval = bestValue = tte->eval_value()) == VALUE_NONE)
-                ss->staticEval = bestValue = evaluate(pos) + Tempo;
+                ss->staticEval = bestValue = evaluate(pos);
 
             // Can ttValue be used as a better position evaluation?
             if (ttValue != VALUE_NONE)
@@ -1111,7 +1108,7 @@ moves_loop: // When in check and at SpNode search starts from here
                     bestValue = ttValue;
         }
         else
-            ss->staticEval = bestValue = ss->nullChild ? -(ss-1)->staticEval + 2 * Tempo : evaluate(pos) + Tempo;
+            ss->staticEval = bestValue = ss->nullChild ? -(ss-1)->staticEval + 2 * Eval::Tempo : evaluate(pos);
 
         // Stand pat. Return immediately if static value is at least beta
         if (bestValue >= beta)