X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=487778e5ad590b007dde1156f9a95eef6c09b559;hp=de4e07fb38a6f37189e5793e899a17f93998a5c6;hb=932ae761c6e3fd3e9b202283379e487a5c187989;hpb=631fa6a1006e487a47b0feb662e5365f9258a2ef

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index de4e07fb..487778e5 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -81,8 +81,6 @@ void init_uci_options() {
   Options["Cowardice"] = Option(100, 0, 200);
   Options["Check Extension (PV nodes)"] = Option(2, 0, 2);
   Options["Check Extension (non-PV nodes)"] = Option(1, 0, 2);
-  Options["Single Evasion Extension (PV nodes)"] = Option(2, 0, 2);
-  Options["Single Evasion Extension (non-PV nodes)"] = Option(2, 0, 2);
   Options["Mate Threat Extension (PV nodes)"] = Option(2, 0, 2);
   Options["Mate Threat Extension (non-PV nodes)"] = Option(2, 0, 2);
   Options["Pawn Push to 7th Extension (PV nodes)"] = Option(1, 0, 2);
@@ -101,7 +99,7 @@ void init_uci_options() {
   Options["OwnBook"] = Option(true);
   Options["MultiPV"] = Option(1, 1, 500);
   Options["Emergency Move Horizon"] = Option(40, 0, 50);
-  Options["Emergency Base Time"] = Option(200, 0, 60000);
+  Options["Emergency Base Time"] = Option(200, 0, 30000);
   Options["Emergency Move Time"] = Option(70, 0, 5000);
   Options["Minimum Thinking Time"] = Option(20, 0, 5000);
   Options["UCI_Chess960"] = Option(false);
@@ -118,28 +116,29 @@ void init_uci_options() {
 }
 
 
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in chronological insertion order (the idx field) and in the format
-/// defined by the UCI protocol.
+/// options_to_uci() returns a string with all the UCI options in chronological
+/// insertion order (the idx field) and in the format defined by the UCI protocol.
 
-void print_uci_options() {
+string options_to_uci() {
+
+  std::stringstream s;
 
   for (size_t i = 0; i <= Options.size(); i++)
       for (OptionsMap::const_iterator it = Options.begin(); it != Options.end(); ++it)
           if (it->second.idx == i)
           {
               const Option& o = it->second;
-              cout << "\noption name " << it->first << " type " << o.type;
+              s << "\noption name " << it->first << " type " << o.type;
 
               if (o.type != "button")
-                  cout << " default " << o.defaultValue;
+                  s << " default " << o.defaultValue;
 
               if (o.type == "spin")
-                  cout << " min " << o.minValue << " max " << o.maxValue;
+                  s << " min " << o.minValue << " max " << o.maxValue;
 
               break;
           }
-  cout << endl;
+  return s.str();
 }
 
 
@@ -163,8 +162,11 @@ void Option::set_value(const string& value) {
 
   assert(!type.empty());
 
-  if (    (type == "check" || type == "button")
-      && !(value == "true" || value == "false"))
+  if (value.empty())
+      return;
+
+  if (   (type == "check" || type == "button")
+      != (value == "true" || value == "false"))
       return;
 
   if (type == "spin")