Revert "Fix random moves when time < 10ms"

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index d0d655cd9f8825023b5e148edfb684904efba42f..efdfce6607141be39c4e97950cd5354d6534db8c 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-2013 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
@@ -17,68 +17,53 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(UCIOPTION_H_INCLUDED)
+#ifndef UCIOPTION_H_INCLUDED
 #define UCIOPTION_H_INCLUDED
 
-#include <cassert>
-#include <cstdlib>
 #include <map>
 #include <string>
 
-class UCIOption {
-public:
-  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& v);
-  template<typename T> T value() const;
-
-private:
-  friend struct OptionsMap;
-
-  std::string defaultValue, currentValue, type;
-  int minValue, maxValue;
-  size_t idx;
-};
+namespace UCI {
 
+class Option;
 
 /// Custom comparator because UCI options should be case insensitive
 struct CaseInsensitiveLess {
   bool operator() (const std::string&, const std::string&) const;
 };
 
+/// Our options container is actually a std::map
+typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
 
-/// Our options container is actually a map with a customized c'tor
-struct OptionsMap : public std::map<std::string, UCIOption, CaseInsensitiveLess> {
-  OptionsMap();
-  std::string print_all() const;
-};
+/// Option class implements an option as defined by UCI protocol
+class Option {
 
-extern OptionsMap Options;
+  typedef void (Fn)(const Option&);
 
+public:
+  Option(Fn* = NULL);
+  Option(bool v, Fn* = NULL);
+  Option(const char* v, Fn* = NULL);
+  Option(int v, int min, int max, Fn* = NULL);
 
-/// Option::value() definition and specializations
-template<typename T>
-T UCIOption::value() const {
+  Option& operator=(const std::string& v);
+  operator int() const;
+  operator std::string() const;
 
-  assert(type == "spin");
-  return T(atoi(currentValue.c_str()));
-}
+private:
+  friend std::ostream& operator<<(std::ostream&, const OptionsMap&);
 
-template<>
-inline std::string UCIOption::value<std::string>() const {
+  std::string defaultValue, currentValue, type;
+  int min, max;
+  size_t idx;
+  Fn* on_change;
+};
 
-  assert(type == "string");
-  return currentValue;
-}
+void init(OptionsMap&);
+void loop(const std::string&);
 
-template<>
-inline bool UCIOption::value<bool>() const {
+} // namespace UCI
 
-  assert(type == "check" || type == "button");
-  return currentValue == "true";
-}
+extern UCI::OptionsMap Options;
 
-#endif // !defined(UCIOPTION_H_INCLUDED)
+#endif // #ifndef UCIOPTION_H_INCLUDED