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.

diff --git a/polyglot.ini b/polyglot.ini
index 739ed8765d4df2ddf00f0a559fd86218254f3e58..b851a33abc8ca1206f6bf357adf3447746066a2c 100644 (file)
--- 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 668fd0955687523cd8d8779dccb1c65aea64e6fb..eb3fc82a40862c24ec907b8bdd53c6d98a34ca08 100644 (file)
--- 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 c96c1d7ba51c8522c91a45871655e2f34e1e3bb3..68a57bd5778fbe24f1205be5ee0e3f3e04c8513f 100644 (file)
--- 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);
 }