From 9f0485e343699b99493e9182f4a4d2ec68171fb8 Mon Sep 17 00:00:00 2001
From: Marco Costalba <mcostalba@gmail.com>
Date: Sat, 1 Mar 2014 12:10:42 +0100
Subject: [PATCH] Retire UCI_AnalyseMode option

It has been obsoleted out already some time ago
and currently there is no point in changing eval
score according to if we are in game or analyzing.

So retire the option.

No functional change.
---
 polyglot.ini      |  1 -
 src/search.cpp    | 15 +++++----------
 src/ucioption.cpp |  1 -
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/polyglot.ini b/polyglot.ini
index 739ed876..b851a33a 100644
--- a/polyglot.ini
+++ b/polyglot.ini
@@ -44,4 +44,3 @@ Emergency Move Time = 70
 Minimum Thinking Time = 20
 Slow Mover = 100
 UCI_Chess960 = false
-UCI_AnalyseMode = false
diff --git a/src/search.cpp b/src/search.cpp
index 668fd095..eb3fc82a 100644
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -185,6 +185,11 @@ void Search::think() {
   RootColor = RootPos.side_to_move();
   TimeMgr.init(Limits, RootPos.game_ply(), RootColor);
 
+  // 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);
+
   if (RootMoves.empty())
   {
       RootMoves.push_back(MOVE_NONE);
@@ -206,16 +211,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"]);
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index c96c1d7b..68a57bd5 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -85,7 +85,6 @@ void init(OptionsMap& o) {
   o["Minimum Thinking Time"]       = Option(20, 0, 5000);
   o["Slow Mover"]                  = Option(80, 10, 1000);
   o["UCI_Chess960"]                = Option(false);
-  o["UCI_AnalyseMode"]             = Option(false, on_eval);
 }
 
 
-- 
2.39.2