X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=7c38283cd48cf40124860487d802014a007f0bc2;hp=51987d03c9d01c5ee05b4332d156de47fecf830a;hb=b011818917fc6fddb3b4e4210f4a408eb4779d59;hpb=4220f191d8c1d597ff66e41f90af11367b0ebd7f

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 51987d03..7c38283c 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -33,10 +33,11 @@ OptionsMap Options; // Global object
 namespace {
 
 /// 'On change' actions, triggered by an option's value change
-void on_eval(UCIOption&) { Eval::init(); }
-void on_threads(UCIOption&) { Threads.read_uci_options(); }
-void on_hash_size(UCIOption& o) { TT.set_size(o); }
-void on_clear_hash(UCIOption& o) { TT.clear(); o = false; } // UCI button
+void on_logger(const UCIOption& opt) { start_logger(opt); }
+void on_eval(const UCIOption&) { Eval::init(); }
+void on_threads(const UCIOption&) { Threads.read_uci_options(); }
+void on_hash_size(const UCIOption& opt) { TT.set_size(opt); }
+void on_clear_hash(const UCIOption&) { TT.clear(); }
 
 /// Our case insensitive less() function as required by UCI protocol
 bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
@@ -44,20 +45,20 @@ bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
 }
 
 bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
-  return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
+  return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
 }
 
 
-/// OptionsMap c'tor initializes the UCI options to their hard coded default
+/// UCIOptions::init() initializes the UCI options to their hard coded default
 /// values and initializes the default value of "Threads" and "Min Split Depth"
 /// parameters according to the number of CPU cores detected.
 
-OptionsMap::OptionsMap() {
+void UCIOptions::init(OptionsMap& o) {
 
   int cpus = std::min(cpu_count(), MAX_THREADS);
   int msd = cpus < 8 ? 4 : 7;
-  OptionsMap& o = *this;
 
+  o["Use Debug Log"]               = UCIOption(false, on_logger);
   o["Use Search Log"]              = UCIOption(false);
   o["Search Log Filename"]         = UCIOption("SearchLog.txt");
   o["Book File"]                   = UCIOption("book.bin");
@@ -71,12 +72,12 @@ OptionsMap::OptionsMap() {
   o["Cowardice"]                   = UCIOption(100, 0, 200, on_eval);
   o["Min Split Depth"]             = UCIOption(msd, 4, 7, on_threads);
   o["Max Threads per Split Point"] = UCIOption(5, 4, 8, on_threads);
-  o["Threads"]                     = UCIOption(cpus, 1, MAX_THREADS);
+  o["Threads"]                     = UCIOption(cpus, 1, MAX_THREADS, on_threads);
   o["Use Sleeping Threads"]        = UCIOption(true, on_threads);
   o["Hash"]                        = UCIOption(32, 4, 8192, on_hash_size);
-  o["Clear Hash"]                  = UCIOption(false, on_clear_hash);
+  o["Clear Hash"]                  = UCIOption(on_clear_hash);
   o["Ponder"]                      = UCIOption(true);
-  o["OwnBook"]                     = UCIOption(true);
+  o["OwnBook"]                     = UCIOption(false);
   o["MultiPV"]                     = UCIOption(1, 1, 500);
   o["Skill Level"]                 = UCIOption(20, 0, 20);
   o["Emergency Move Horizon"]      = UCIOption(40, 0, 50);
@@ -121,6 +122,9 @@ UCIOption::UCIOption(const char* v, Fn* f) : type("string"), min(0), max(0), idx
 UCIOption::UCIOption(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f)
 { defaultValue = currentValue = (v ? "true" : "false"); }
 
+UCIOption::UCIOption(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f)
+{}
+
 UCIOption::UCIOption(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f)
 { std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
 
@@ -129,17 +133,20 @@ UCIOption::UCIOption(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv)
 /// check for option's limits, but we could receive the new value directly from
 /// the user by console window, so let's check the bounds anyway.
 
-void UCIOption::operator=(const string& v) {
+UCIOption& UCIOption::operator=(const string& v) {
 
   assert(!type.empty());
 
-  if (   !v.empty()
-      && (type == "check") == (v == "true" || v == "false")
-      && (type != "spin" || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
-  {
+  if (   (type != "button" && v.empty())
+      || (type == "check" && v != "true" && v != "false")
+      || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max)))
+      return *this;
+
+  if (type != "button")
       currentValue = v;
 
-      if (on_change)
-          (*on_change)(*this);
-  }
+  if (on_change)
+      (*on_change)(*this);
+
+  return *this;
 }