Fix "go nodes", at least when Threads=1

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index 50cc100e581a99cec3b644c4b7c76e023f744393..f80ff86ec43a584a650dfc962aea95e1150f4c56 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -25,43 +25,50 @@
 #include <map>
 #include <string>
 
-class Option {
+struct OptionsMap;
+
+/// UCIOption class implements an option as defined by UCI protocol
+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() {} // Required by std::map::operator[]
+  UCIOption(const char* v);
+  UCIOption(bool v, std::string type = "check");
+  UCIOption(int v, int min, int max);
+
+  void operator=(const std::string& v);
+  void operator=(bool v) { *this = std::string(v ? "true" : "false"); }
 
-  void set_value(const std::string& value);
-  template<typename T> T value() const;
+  operator int() const {
+    assert(type == "check" || type == "button" || type == "spin");
+    return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
+  }
+
+  operator std::string() const {
+    assert(type == "string");
+    return currentValue;
+  }
 
 private:
-  friend void init_uci_options();
-  friend void print_uci_options();
+  friend std::ostream& operator<<(std::ostream&, const OptionsMap&);
 
   std::string defaultValue, currentValue, type;
+  int min, max;
   size_t idx;
-  int minValue, maxValue;
 };
 
-template<typename T>
-inline T Option::value() const {
 
-    assert(type != "UNDEFINED");
-    return T(atoi(currentValue.c_str()));
-}
-
-template<>
-inline std::string Option::value<std::string>() const {
+/// Custom comparator because UCI options should be case insensitive
+struct CaseInsensitiveLess {
+  bool operator() (const std::string&, const std::string&) const;
+};
 
-    assert(type != "UNDEFINED");
-    return currentValue;
-}
 
-typedef std::map<std::string, Option> OptionsMap;
+/// Our options container is actually a map with a customized c'tor
+struct OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
+  OptionsMap();
+};
 
+extern std::ostream& operator<<(std::ostream&, const OptionsMap&);
 extern OptionsMap Options;
-extern void init_uci_options();
-extern void print_uci_options();
 
 #endif // !defined(UCIOPTION_H_INCLUDED)