X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fucioption.h;h=de75d1213e133362417fff8260c8bf38f90853cb;hb=f57d51b7f3b5d97b7322aa7e4bd9025726a518e3;hp=bc48d6e8d25d00e9f9ec2d2ccba7ed0e96957b6b;hpb=539051b1e0fb099c0d0da69d20d6a4c2b98a2cb6;p=stockfish

diff --git a/src/ucioption.h b/src/ucioption.h
index bc48d6e8..de75d121 100644
--- 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 Marco Costalba
+  Copyright (C) 2008-2010 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,37 +17,58 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(UCIOPTION_H_INCLUDED)
 #define UCIOPTION_H_INCLUDED
 
-////
-//// Includes
-////
-
+#include <cassert>
+#include <cstdlib>
+#include <map>
 #include <string>
 
+class Option {
+public:
+  Option() {} // To allow insertion in a std::map
+  Option(const char* defaultValue);
+  Option(bool defaultValue, std::string type = "check");
+  Option(int defaultValue, int minValue, int maxValue);
+
+  void set_value(const std::string& value);
+  template<typename T> T value() const;
+
+private:
+  friend void init_uci_options();
+  friend void print_uci_options();
+
+  std::string defaultValue, currentValue, type;
+  size_t idx;
+  int minValue, maxValue;
+};
 
-////
-//// Variables
-////
+template<typename T>
+inline T Option::value() const {
 
-extern bool Chess960;
+    assert(type == "spin");
+    return T(atoi(currentValue.c_str()));
+}
 
+template<>
+inline std::string Option::value<std::string>() const {
 
-////
-//// Prototypes
-////
+    assert(type == "string");
+    return currentValue;
+}
 
+template<>
+inline bool Option::value<bool>() const {
+
+    assert(type == "check" || type == "button");
+    return currentValue == "true";
+}
+
+typedef std::map<std::string, Option> OptionsMap;
+
+extern OptionsMap Options;
 extern void init_uci_options();
 extern void print_uci_options();
-extern bool get_option_value_bool(const std::string &optionName);
-extern int get_option_value_int(const std::string &optionName);
-extern const std::string get_option_value_string(const std::string &optionName);
-extern bool button_was_pressed(const std::string &buttonName);
-extern void set_option_value(const std::string &optionName,
-                             const std::string &newValue);
-extern void push_button(const std::string &buttonName);
-
 
 #endif // !defined(UCIOPTION_H_INCLUDED)