X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fucioption.cpp;h=397574e019c89e75c2852a61385e44cdd49ba9a0;hb=6b9a22b40d37d27ad10cafd8697d96e90a586f8a;hp=6fdc6e77a1b22f2eccc9128d61a597ede0f23bde;hpb=d3260ce70f6a17f9d43d199f0e07488888188f8b;p=stockfish

diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 6fdc6e77..397574e0 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -1,7 +1,8 @@
 /*
   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-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, 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,299 +18,146 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
 #include <algorithm>
 #include <cassert>
-#include <map>
-#include <string>
-#include <sstream>
-#include <vector>
+#include <ostream>
 
 #include "misc.h"
+#include "search.h"
 #include "thread.h"
-#include "ucioption.h"
+#include "tt.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
 
 using std::string;
-using std::cout;
-using std::endl;
-
-////
-//// Local definitions
-////
-
-namespace {
-
-  enum OptionType { SPIN, COMBO, CHECK, STRING, BUTTON };
-
-  typedef std::vector<string> StrVector;
-
-  struct Option {
-
-    string name, defaultValue, currentValue;
-    OptionType type;
-    size_t idx;
-    int minValue, maxValue;
-    StrVector comboValues;
-
-    Option();
-    Option(const char* defaultValue, OptionType = STRING);
-    Option(bool defaultValue, OptionType = CHECK);
-    Option(int defaultValue, int minValue, int maxValue);
-
-    bool operator<(const Option& o) const { return idx < o.idx; }
-  };
-
-  typedef std::vector<Option> OptionsVector;
-  typedef std::map<string, Option> Options;
-
-  Options options;
-
-  // stringify() converts a value of type T to a std::string
-  template<typename T>
-  string stringify(const T& v) {
-
-     std::ostringstream ss;
-     ss << v;
-     return ss.str();
-  }
-
-  Option::Option() {} // To allow insertion in a std::map
-
-  Option::Option(const char* def, OptionType t)
-  : defaultValue(def), currentValue(def), type(t), idx(options.size()), minValue(0), maxValue(0) {}
-
-  Option::Option(bool def, OptionType t)
-  : defaultValue(stringify(def)), currentValue(stringify(def)), type(t), idx(options.size()), minValue(0), maxValue(0) {}
-
-  Option::Option(int def, int minv, int maxv)
-  : defaultValue(stringify(def)), currentValue(stringify(def)), type(SPIN), idx(options.size()), minValue(minv), maxValue(maxv) {}
-
-  // load_defaults() populates the options map with the hard
-  // coded names and default values.
-
-  void load_defaults(Options& o) {
-
-    o["Use Search Log"] = Option(false);
-    o["Search Log Filename"] = Option("SearchLog.txt");
-    o["Book File"] = Option("book.bin");
-    o["Best Book Move"] = Option(false);
-    o["Mobility (Middle Game)"] = Option(100, 0, 200);
-    o["Mobility (Endgame)"] = Option(100, 0, 200);
-    o["Pawn Structure (Middle Game)"] = Option(100, 0, 200);
-    o["Pawn Structure (Endgame)"] = Option(100, 0, 200);
-    o["Passed Pawns (Middle Game)"] = Option(100, 0, 200);
-    o["Passed Pawns (Endgame)"] = Option(100, 0, 200);
-    o["Space"] = Option(100, 0, 200);
-    o["Aggressiveness"] = Option(100, 0, 200);
-    o["Cowardice"] = Option(100, 0, 200);
-    o["Check Extension (PV nodes)"] = Option(2, 0, 2);
-    o["Check Extension (non-PV nodes)"] = Option(1, 0, 2);
-    o["Single Evasion Extension (PV nodes)"] = Option(2, 0, 2);
-    o["Single Evasion Extension (non-PV nodes)"] = Option(2, 0, 2);
-    o["Mate Threat Extension (PV nodes)"] = Option(2, 0, 2);
-    o["Mate Threat Extension (non-PV nodes)"] = Option(2, 0, 2);
-    o["Pawn Push to 7th Extension (PV nodes)"] = Option(1, 0, 2);
-    o["Pawn Push to 7th Extension (non-PV nodes)"] = Option(1, 0, 2);
-    o["Passed Pawn Extension (PV nodes)"] = Option(1, 0, 2);
-    o["Passed Pawn Extension (non-PV nodes)"] = Option(0, 0, 2);
-    o["Pawn Endgame Extension (PV nodes)"] = Option(2, 0, 2);
-    o["Pawn Endgame Extension (non-PV nodes)"] = Option(2, 0, 2);
-    o["Minimum Split Depth"] = Option(4, 4, 7);
-    o["Maximum Number of Threads per Split Point"] = Option(5, 4, 8);
-    o["Threads"] = Option(1, 1, MAX_THREADS);
-    o["Hash"] = Option(32, 4, 8192);
-    o["Clear Hash"] = Option(false, BUTTON);
-    o["New Game"] = Option(false, BUTTON);
-    o["Ponder"] = Option(true);
-    o["OwnBook"] = Option(true);
-    o["MultiPV"] = Option(1, 1, 500);
-    o["UCI_Chess960"] = Option(false);
-    o["UCI_AnalyseMode"] = Option(false);
-
-    // Any option should know its name so to be easily printed
-    for (Options::iterator it = o.begin(); it != o.end(); ++it)
-        it->second.name = it->first;
-  }
-
-  // get_option_value() implements the various get_option_value_<type>
-  // functions defined later.
-
-  template<typename T>
-  T get_option_value(const string& optionName) {
-
-      T ret = T();
-      if (options.find(optionName) == options.end())
-          return ret;
-
-      std::istringstream ss(options[optionName].currentValue);
-      ss >> ret;
-      return ret;
-  }
-
-  // Specialization for std::string where instruction 'ss >> ret'
-  // would erroneusly tokenize a string with spaces.
-  template<>
-  string get_option_value<string>(const string& optionName) {
-
-      if (options.find(optionName) == options.end())
-          return string();
-
-      return options[optionName].currentValue;
-  }
-
-}
-
 
-/// init_uci_options() initializes the UCI options. Currently, the only thing
-/// this function does is to initialize the default value of "Threads" and
-/// "Minimum Split Depth" parameters according to the number of CPU cores.
+UCI::OptionsMap Options; // Global object
 
-void init_uci_options() {
+namespace UCI {
 
-  load_defaults(options);
+/// 'On change' actions, triggered by an option's value change
+void on_clear_hash(const Option&) { Search::clear(); }
+void on_hash_size(const Option& o) { TT.resize(o); }
+void on_logger(const Option& o) { start_logger(o); }
+void on_threads(const Option&) { Threads.read_uci_options(); }
+void on_tb_path(const Option& o) { Tablebases::init(o); }
 
-  assert(options.find("Threads") != options.end());
-  assert(options.find("Minimum Split Depth") != options.end());
 
-  Option& thr = options["Threads"];
-  Option& msd = options["Minimum Split Depth"];
+/// Our case insensitive less() function as required by UCI protocol
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
 
-  thr.defaultValue = thr.currentValue = stringify(cpu_count());
-
-  if (cpu_count() >= 8)
-      msd.defaultValue = msd.currentValue = stringify(7);
+  return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(),
+         [](char c1, char c2) { return tolower(c1) < tolower(c2); });
 }
 
 
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in the format defined by the UCI protocol.
+/// init() initializes the UCI options to their hard-coded default values
+
+void init(OptionsMap& o) {
+
+  const int MaxHashMB = Is64Bit ? 1024 * 1024 : 2048;
+
+  o["Debug Log File"]        << Option("", on_logger);
+  o["Contempt"]              << Option(0, -100, 100);
+  o["Threads"]               << Option(1, 1, 512, on_threads);
+  o["Hash"]                  << Option(16, 1, MaxHashMB, on_hash_size);
+  o["Clear Hash"]            << Option(on_clear_hash);
+  o["Ponder"]                << Option(false);
+  o["MultiPV"]               << Option(1, 1, 500);
+  o["Skill Level"]           << Option(20, 0, 20);
+  o["Move Overhead"]         << Option(30, 0, 5000);
+  o["Minimum Thinking Time"] << Option(20, 0, 5000);
+  o["Slow Mover"]            << Option(89, 10, 1000);
+  o["nodestime"]             << Option(0, 0, 10000);
+  o["UCI_Chess960"]          << Option(false);
+  o["SyzygyPath"]            << Option("<empty>", on_tb_path);
+  o["SyzygyProbeDepth"]      << Option(1, 1, 100);
+  o["Syzygy50MoveRule"]      << Option(true);
+  o["SyzygyProbeLimit"]      << Option(6, 0, 6);
+}
 
-void print_uci_options() {
 
-  const char OptTypeName[][16] = {
-    "spin", "combo", "check", "string", "button"
-  };
+/// operator<<() is used to print all the options default values in chronological
+/// insertion order (the idx field) and in the format defined by the UCI protocol.
 
-  // Build up a vector out of the options map and sort it according to idx
-  // field, that is the chronological insertion order in options map.
-  OptionsVector vec;
-  for (Options::const_iterator it = options.begin(); it != options.end(); ++it)
-      vec.push_back(it->second);
+std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
 
-  std::sort(vec.begin(), vec.end());
+  for (size_t idx = 0; idx < om.size(); ++idx)
+      for (const auto& it : om)
+          if (it.second.idx == idx)
+          {
+              const Option& o = it.second;
+              os << "\noption name " << it.first << " type " << o.type;
 
-  for (OptionsVector::const_iterator it = vec.begin(); it != vec.end(); ++it)
-  {
-      cout << "\noption name " << it->name << " type " << OptTypeName[it->type];
+              if (o.type != "button")
+                  os << " default " << o.defaultValue;
 
-      if (it->type == BUTTON)
-          continue;
+              if (o.type == "spin")
+                  os << " min " << o.min << " max " << o.max;
 
-      if (it->type == CHECK)
-          cout << " default " << (it->defaultValue == "1" ? "true" : "false");
-      else
-          cout << " default " << it->defaultValue;
+              break;
+          }
 
-      if (it->type == SPIN)
-          cout << " min " << it->minValue << " max " << it->maxValue;
-      else if (it->type == COMBO)
-      {
-          StrVector::const_iterator itc;
-          for (itc = it->comboValues.begin(); itc != it->comboValues.end(); ++itc)
-              cout << " var " << *itc;
-      }
-  }
-  cout << endl;
+  return os;
 }
 
 
-/// get_option_value_bool() returns the current value of a UCI parameter of
-/// type "check".
+/// Option class constructors and conversion operators
 
-bool get_option_value_bool(const string& optionName) {
-
-  return get_option_value<bool>(optionName);
-}
+Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), on_change(f)
+{ defaultValue = currentValue = v; }
 
+Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f)
+{ defaultValue = currentValue = (v ? "true" : "false"); }
 
-/// get_option_value_int() returns the value of a UCI parameter as an integer.
-/// Normally, this function will be used for a parameter of type "spin", but
-/// it could also be used with a "combo" parameter, where all the available
-/// values are integers.
+Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f)
+{}
 
-int get_option_value_int(const string& optionName) {
+Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f)
+{ defaultValue = currentValue = std::to_string(v); }
 
-  return get_option_value<int>(optionName);
+Option::operator int() const {
+  assert(type == "check" || type == "spin");
+  return (type == "spin" ? stoi(currentValue) : currentValue == "true");
 }
 
-
-/// get_option_value_string() returns the current value of a UCI parameter as
-/// a string. It is used with parameters of type "combo" and "string".
-
-string get_option_value_string(const string& optionName) {
-
-   return get_option_value<string>(optionName);
+Option::operator std::string() const {
+  assert(type == "string");
+  return currentValue;
 }
 
 
-/// set_option_value() inserts a new value for a UCI parameter
-
-void set_option_value(const string& name, const string& value) {
-
-  if (options.find(name) == options.end())
-  {
-      cout << "No such option: " << name << endl;
-      return;
-  }
+/// operator<<() inits options and assigns idx in the correct printing order
 
-  // UCI protocol uses "true" and "false" instead of "1" and "0", so convert
-  // value according to standard C++ convention before to store it.
-  string v(value);
-  if (v == "true")
-      v = "1";
-  else if (v == "false")
-      v = "0";
+void Option::operator<<(const Option& o) {
 
-  // Normally it's up to the GUI to check for option's limits,
-  // but we could receive the new value directly from the user
-  // by teminal window. So let's check the bounds anyway.
-  Option& opt = options[name];
+  static size_t insert_order = 0;
 
-  if (opt.type == CHECK && v != "0" && v != "1")
-      return;
-
-  else if (opt.type == SPIN)
-  {
-      int val = atoi(v.c_str());
-      if (val < opt.minValue || val > opt.maxValue)
-          return;
-  }
-  opt.currentValue = v;
+  *this = o;
+  idx = insert_order++;
 }
 
 
-/// push_button() is used to tell the engine that a UCI parameter of type
-/// "button" has been selected:
-
-void push_button(const string& buttonName) {
+/// operator=() updates currentValue and triggers on_change() action. It's up to
+/// the GUI to check for option's limits, but we could receive the new value from
+/// the user by console window, so let's check the bounds anyway.
 
-  set_option_value(buttonName, "true");
-}
+Option& Option::operator=(const string& v) {
 
+  assert(!type.empty());
 
-/// button_was_pressed() tests whether a UCI parameter of type "button" has
-/// been selected since the last time the function was called, in this case
-/// it also resets the button.
+  if (   (type != "button" && v.empty())
+      || (type == "check" && v != "true" && v != "false")
+      || (type == "spin" && (stoi(v) < min || stoi(v) > max)))
+      return *this;
 
-bool button_was_pressed(const string& buttonName) {
+  if (type != "button")
+      currentValue = v;
 
-  if (!get_option_value<bool>(buttonName))
-      return false;
+  if (on_change)
+      on_change(*this);
 
-  set_option_value(buttonName, "false");
-  return true;
+  return *this;
 }
+
+} // namespace UCI