Reduce indentation in UCIOption::operator=()

[stockfish] / src / ucioption.cpp

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index fe1a4709e706568487dccf431c072ae08b12416c..763db556654e4c87828854bc7290d056ba8038da 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -33,9 +33,10 @@ OptionsMap Options; // Global object
 namespace {
 
 /// 'On change' actions, triggered by an option's value change
+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& o) { TT.set_size(o); }
+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
@@ -44,7 +45,7 @@ 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);
 }
 
 
@@ -58,6 +59,7 @@ OptionsMap::OptionsMap() {
   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,7 +73,7 @@ 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(on_clear_hash);
@@ -122,7 +124,7 @@ UCIOption::UCIOption(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options
 { defaultValue = currentValue = (v ? "true" : "false"); }
 
 UCIOption::UCIOption(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f)
-{ defaultValue = currentValue = "false"; }
+{}
 
 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(); }
@@ -136,16 +138,14 @@ void UCIOption::operator=(const string& v) {
 
   assert(!type.empty());
 
-  if (   !v.empty()
-      && (type == "check" || type == "button") == (v == "true" || v == "false")
-      && (type != "spin" || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
-  {
-      currentValue = v;
+  if (   (type != "button" && v.empty())
+      || (type == "check" && v != "true" && v != "false")
+      || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max)))
+      return;
 
-      if (on_change)
-          (*on_change)(*this);
+  if (type != "button")
+      currentValue = v;
 
-      if (type == "button")
-          currentValue = "false";
-  }
+  if (on_change)
+      (*on_change)(*this);
 }