Retire struct OptionsMap

[stockfish] / src / ucioption.cpp

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 4be580fcbfaf0760974300e02871580549577686..7c38283cd48cf40124860487d802014a007f0bc2 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -45,19 +45,18 @@ 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);
@@ -134,18 +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 (   (type == "button" || !v.empty())
-      && (type != "check"  || (v == "true" || v == "false"))
-      && (type != "spin"   || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
-  {
-      if (type != "button")
-          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 *this;
 
-      if (on_change)
-          (*on_change)(*this);
-  }
+  if (type != "button")
+      currentValue = v;
+
+  if (on_change)
+      (*on_change)(*this);
+
+  return *this;
 }