Revert dynamic draw value

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 668fd0955687523cd8d8779dccb1c65aea64e6fb..72ec79e71f3e95539d0b05776147d3d51a040d41 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -185,6 +185,10 @@ void Search::think() {
   RootColor = RootPos.side_to_move();
   TimeMgr.init(Limits, RootPos.game_ply(), RootColor);
 
+  int cf = Options["Contempt Factor"] * PawnValueMg / 100; // From centipawns
+  DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
+  DrawValue[~RootColor] = VALUE_DRAW + Value(cf);
+
   if (RootMoves.empty())
   {
       RootMoves.push_back(MOVE_NONE);
@@ -206,16 +210,6 @@ void Search::think() {
       }
   }
 
-  if (!Options["UCI_AnalyseMode"])
-  {
-      // Dynamic draw value: try to avoid repetition draws at early midgame
-      int cf = std::max(70 - RootPos.game_ply(), 0);
-      DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
-      DrawValue[~RootColor] = VALUE_DRAW + Value(cf);
-  }
-  else
-      DrawValue[WHITE] = DrawValue[BLACK] = VALUE_DRAW;
-
   if (Options["Write Search Log"])
   {
       Log log(Options["Search Log Filename"]);