Store UCI options of type CHECK according to C++ convention

[stockfish] / src / ucioption.cpp

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 9e992be55c26e7fd50462fb4ac5748393d37862e..c31a49e78ae9b62e4cbfb7872baf0edf8db31c1a 100644 (file)
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -22,6 +22,7 @@
 //// Includes
 ////
 
+#include <algorithm>
 #include <cassert>
 #include <map>
 #include <string>
@@ -56,15 +57,18 @@ namespace {
 
   struct Option {
 
-    std::string defaultValue, currentValue;
+    std::string name, defaultValue, currentValue;
     OptionType type;
     int minValue, maxValue;
     ComboValues comboValues;
+    size_t idx;
 
     Option();
     Option(const std::string& defaultValue, OptionType = STRING);
     Option(bool defaultValue, OptionType = CHECK);
     Option(int defaultValue, int minValue, int maxValue);
+
+    bool operator<(const Option& o) { return this->idx < o.idx; }
   };
 
   typedef std::map<std::string, Option> Options;
@@ -142,6 +146,10 @@ namespace {
     o["MultiPV"] = Option(1, 1, 500);
     o["UCI_ShowCurrLine"] = Option(false);
     o["UCI_Chess960"] = Option(false);
+
+    // Any option should know its name so to be easily printed
+    for (Options::iterator it = o.begin(); it != o.end(); ++it)
+        it->second.name = it->first;
   }
 
   ///
@@ -159,13 +167,6 @@ namespace {
      return ss.str();
   }
 
-  // We want conversion from a bool value to be "true" or "false",
-  // not "1" or "0", so add a specialization for bool type.
-  template<>
-  std::string stringify<bool>(const bool& v) {
-
-    return v ? "true" : "false";
-  }
 
   // get_option_value implements the various get_option_value_<type>
   // functions defined later, because only the option value
@@ -183,19 +184,6 @@ namespace {
       return ret;
   }
 
-  // Unfortunatly we need a specialization to convert "false" and "true"
-  // to proper bool values. The culprit is that we use a non standard way
-  // to store a bool value in a string, in particular we use "false" and
-  // "true" instead of "0" and "1" due to how UCI protocol works.
-
-  template<>
-  bool get_option_value<bool>(const std::string& optionName) {
-
-      if (options.find(optionName) == options.end())
-          return false;
-
-      return options[optionName].currentValue == "true";
-  }
 }
 
 ////
@@ -240,27 +228,37 @@ void print_uci_options() {
     "spin", "combo", "check", "string", "button"
   };
 
+  // Build up a vector out of the options map and sort it according to idx
+  // field, that is the chronological insertion order in options map.
+  std::vector<Option> vec;
   for (Options::const_iterator it = options.begin(); it != options.end(); ++it)
+      vec.push_back(it->second);
+
+  std::sort(vec.begin(), vec.end());
+
+  for (std::vector<Option>::const_iterator it = vec.begin(); it != vec.end(); ++it)
   {
-      const Option& o = it->second;
-      std::cout << "option name " << it->first
-                << " type "       << optionTypeName[o.type];
-
-      if (o.type != BUTTON)
-      {
-          std::cout << " default " << o.defaultValue;
-
-          if (o.type == SPIN)
-              std::cout << " min " << o.minValue
-                        << " max " << o.maxValue;
-
-          else if (o.type == COMBO)
-              for (ComboValues::const_iterator itc = o.comboValues.begin();
-                  itc != o.comboValues.end(); ++itc)
-                      std::cout << " var " << *itc;
-      }
-      std::cout << std::endl;
+      std::cout << "\noption name " << it->name
+                << " type "         << optionTypeName[it->type];
+
+      if (it->type == BUTTON)
+          continue;
+
+      if (it->type == CHECK)
+          std::cout << " default " << (it->defaultValue == "1" ? "true" : "false");
+      else
+          std::cout << " default " << it->defaultValue;
+
+      if (it->type == SPIN)
+          std::cout << " min " << it->minValue
+                    << " max " << it->maxValue;
+
+      else if (it->type == COMBO)
+          for (ComboValues::const_iterator itc = it->comboValues.begin();
+              itc != it->comboValues.end(); ++itc)
+              std::cout << " var " << *itc;
   }
+  std::cout << std::endl;
 }
 
 
@@ -300,8 +298,16 @@ const std::string get_option_value_string(const std::string& optionName) {
 void set_option_value(const std::string& optionName,
                       const std::string& newValue) {
 
+  // UCI protocol uses "true" and "false" instead of "1" and "0", so convert
+  // newValue according to standard C++ convention before to store it.
+  std::string v(newValue);
+  if (v == "true")
+      v = "1";
+  else if (v == "false")
+      v = "0";
+
   if (options.find(optionName) != options.end())
-      options[optionName].currentValue = newValue;
+      options[optionName].currentValue = v;
   else
       std::cout << "No such option: " << optionName << std::endl;
 }
@@ -337,12 +343,12 @@ namespace {
   Option::Option() {} // To allow insertion in a std::map
 
   Option::Option(const std::string& def, OptionType t)
-  : defaultValue(def), currentValue(def), type(t), minValue(0), maxValue(0) {}
+  : defaultValue(def), currentValue(def), type(t), idx(options.size()), minValue(0), maxValue(0) {}
 
   Option::Option(bool def, OptionType t)
-  : defaultValue(stringify(def)), currentValue(stringify(def)), type(t), minValue(0), maxValue(0) {}
+  : defaultValue(stringify(def)), currentValue(stringify(def)), type(t), idx(options.size()), minValue(0), maxValue(0) {}
 
   Option::Option(int def, int minv, int maxv)
-  : defaultValue(stringify(def)), currentValue(stringify(def)), type(SPIN), minValue(minv), maxValue(maxv) {}
+  : defaultValue(stringify(def)), currentValue(stringify(def)), type(SPIN), idx(options.size()), minValue(minv), maxValue(maxv) {}
 
 }