Initialize killers at ss+2 also in root_search()

[stockfish] / src / ucioption.h

diff --git a/src/ucioption.h b/src/ucioption.h
index 7d7ce714b3e0b0c6e921fdd4f6a7cae368a19982..ae7d392a01d8e52fc4942f18c540a3383f58a30b 100644 (file)
--- a/src/ucioption.h
+++ b/src/ucioption.h
@@ -1,53 +1,80 @@
 /*
   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
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   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);
 
-////
-//// Variables
-////
+  void set_value(const std::string& value);
+  template<typename T> T value() const;
 
-extern bool Chess960;
+private:
+  friend void init_uci_options();
+  friend std::string options_to_uci();
 
+  std::string defaultValue, currentValue, type;
+  size_t idx;
+  int minValue, maxValue;
+};
 
-////
-//// Prototypes
-////
+template<typename T>
+inline T Option::value() const {
 
-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);
+  assert(type == "spin");
+  return T(atoi(currentValue.c_str()));
+}
+
+template<>
+inline std::string Option::value<std::string>() const {
+
+  assert(type == "string");
+  return currentValue;
+}
 
+template<>
+inline bool Option::value<bool>() const {
+
+  assert(type == "check" || type == "button");
+  return currentValue == "true";
+}
+
+
+// Custom comparator because UCI options should not be case sensitive
+struct CaseInsensitiveLess {
+  bool operator() (const std::string&, const std::string&) const;
+};
+
+typedef std::map<std::string, Option, CaseInsensitiveLess> OptionsMap;
+
+extern OptionsMap Options;
+extern void init_uci_options();
+extern std::string options_to_uci();
 
 #endif // !defined(UCIOPTION_H_INCLUDED)