From: lucasart <lucas.braesch@gmail.com>
Date: Mon, 15 Sep 2014 19:24:51 +0000 (+0100)
Subject: Simplify Time Management UCI options
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=b66552fc277ec6587bd93514a7a175d7905b2c6d

Simplify Time Management UCI options

No functional change
---

diff --git a/src/timeman.cpp b/src/timeman.cpp
index c305e611..11405bb9 100644
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -78,7 +78,7 @@ void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color u
       increment >  0 && movesToGo == 0 means: x basetime + z increment
       increment >  0 && movesToGo != 0 means: x moves in y minutes + z increment
 
-    Time management is adjusted by following UCI parameters:
+    Time management is adjusted by following parameters:
 
       emergencyMoveHorizon: Be prepared to always play at least this many moves
       emergencyBaseTime   : Always attempt to keep at least this much time (in ms) at clock
@@ -89,9 +89,9 @@ void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color u
   int hypMTG, hypMyTime, t1, t2;
 
   // Read uci parameters
-  int emergencyMoveHorizon = Options["Emergency Move Horizon"];
-  int emergencyBaseTime    = Options["Emergency Base Time"];
-  int emergencyMoveTime    = Options["Emergency Move Time"];
+  int emergencyMoveHorizon = 40;
+  int emergencyBaseTime    = Options["Move Overhead"] * 2;
+  int emergencyMoveTime    = Options["Move Overhead"];
   int minThinkingTime      = Options["Minimum Thinking Time"];
   int slowMover            = Options["Slow Mover"];
 
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 3329a468..e4ea5b07 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -63,9 +63,7 @@ void init(OptionsMap& o) {
   o["Ponder"]                   << Option(true);
   o["MultiPV"]                  << Option(1, 1, 500);
   o["Skill Level"]              << Option(20, 0, 20);
-  o["Emergency Move Horizon"]   << Option(40, 0, 50);
-  o["Emergency Base Time"]      << Option(60, 0, 30000);
-  o["Emergency Move Time"]      << Option(30, 0, 5000);
+  o["Move Overhead"]            << Option(30, 0, 5000);
   o["Minimum Thinking Time"]    << Option(20, 0, 5000);
   o["Slow Mover"]               << Option(80, 10, 1000);
   o["UCI_Chess960"]             << Option(false);