Fix bug in evaluate_passed_pawns()

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index 50cc100e581a99cec3b644c4b7c76e023f744393..b6ad959cc353a9e5a3579d2973410fc2d88d2b10 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -25,43 +25,61 @@
 #include <map>
 #include <string>
 
-class Option {
+class UCIOption {
 public:
-  Option(); // To allow insertion in a std::map
-  Option(const char* defaultValue, std::string type = "string");
-  Option(bool defaultValue, std::string type = "check");
-  Option(int defaultValue, int minValue, int maxValue);
+  UCIOption() {} // To be used in a std::map
+  UCIOption(const char* defaultValue);
+  UCIOption(bool defaultValue, std::string type = "check");
+  UCIOption(int defaultValue, int minValue, int maxValue);
 
-  void set_value(const std::string& value);
+  void set_value(const std::string& v);
   template<typename T> T value() const;
 
 private:
-  friend void init_uci_options();
-  friend void print_uci_options();
+  friend class OptionsMap;
 
   std::string defaultValue, currentValue, type;
-  size_t idx;
   int minValue, maxValue;
+  size_t idx;
+};
+
+
+/// Custom comparator because UCI options should not be case sensitive
+struct CaseInsensitiveLess {
+  bool operator() (const std::string&, const std::string&) const;
 };
 
+
+/// Our options container is actually a map with a customized c'tor
+class OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
+public:
+  OptionsMap();
+  std::string print_all() const;
+};
+
+extern OptionsMap Options;
+
+
+/// Option::value() definition and specializations
 template<typename T>
-inline T Option::value() const {
+T UCIOption::value() const {
 
-    assert(type != "UNDEFINED");
-    return T(atoi(currentValue.c_str()));
+  assert(type == "spin");
+  return T(atoi(currentValue.c_str()));
 }
 
 template<>
-inline std::string Option::value<std::string>() const {
+inline std::string UCIOption::value<std::string>() const {
 
-    assert(type != "UNDEFINED");
-    return currentValue;
+  assert(type == "string");
+  return currentValue;
 }
 
-typedef std::map<std::string, Option> OptionsMap;
+template<>
+inline bool UCIOption::value<bool>() const {
 
-extern OptionsMap Options;
-extern void init_uci_options();
-extern void print_uci_options();
+  assert(type == "check" || type == "button");
+  return currentValue == "true";
+}
 
 #endif // !defined(UCIOPTION_H_INCLUDED)