X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=6b066f221a955eb3d58b908d7a55334b72c6f651;hp=2db1beeba31a11305fe7a4cb15ed09e6c62f8a99;hb=20a6f99cdb87d5877d490abceb795f7e68c5b4a6;hpb=fb50e16cdda68e05d08ed3992a04e5a396a461e3
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 2db1beeb..6b066f22 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -17,280 +17,111 @@
along with this program. If not, see
-#include
-#include
-#include
#include
-#include
#include "misc.h"
#include "thread.h"
#include "ucioption.h"
using std::string;
-using std::cout;
-using std::endl;
-
-////
-//// Local definitions
-////
-
-namespace {
-
- enum OptionType { SPIN, COMBO, CHECK, STRING, BUTTON };
-
- typedef std::vector 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 OptionsVector;
- typedef std::map Options;
-
- Options options;
-
- // stringify() converts a value of type T to a std::string
- template
- 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["Emergency Move Horizon"] = Option(40, 0, 50);
- o["Emergency Base Time"] = Option(200, 0, 60000);
- o["Emergency Move Time"] = Option(70, 0, 5000);
- o["Minimum Thinking Time"] = Option(20, 0, 5000);
- o["UCI_Chess960"] = Option(false); // Just a dummy but needed by GUIs
- 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_
- // functions defined later.
-
- template
- 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;
- }
+OptionsMap Options; // Global object
- // Specialization for std::string where instruction 'ss >> ret'
- // would erroneusly tokenize a string with spaces.
- template<>
- string get_option_value(const string& optionName) {
- if (options.find(optionName) == options.end())
- return string();
+/// Our case insensitive less() function as required by UCI protocol
+static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
- 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.
-
-void init_uci_options() {
-
- load_defaults(options);
-
- assert(options.find("Threads") != options.end());
- assert(options.find("Minimum Split Depth") != options.end());
-
- Option& thr = options["Threads"];
- Option& msd = options["Minimum Split Depth"];
-
- thr.defaultValue = thr.currentValue = stringify(cpu_count());
-
- if (cpu_count() >= 8)
- msd.defaultValue = msd.currentValue = stringify(7);
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+ return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
}
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in the format defined by the UCI protocol.
-
-void print_uci_options() {
-
- const char OptTypeName[][16] = {
- "spin", "combo", "check", "string", "button"
- };
-
- // 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::sort(vec.begin(), vec.end());
-
- for (OptionsVector::const_iterator it = vec.begin(); it != vec.end(); ++it)
- {
- cout << "\noption name " << it->name << " type " << OptTypeName[it->type];
-
- if (it->type == BUTTON)
- continue;
-
- if (it->type == CHECK)
- cout << " default " << (it->defaultValue == "1" ? "true" : "false");
- else
- cout << " default " << it->defaultValue;
-
- 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;
+/// OptionsMap c'tor initializes the UCI options to their hard coded default
+/// values and initializes the default value of "Threads" and "Min Split Depth"
+/// parameters according to the number of CPU cores detected.
+
+OptionsMap::OptionsMap() {
+
+ int cpus = std::min(cpu_count(), MAX_THREADS);
+ int msd = cpus < 8 ? 4 : 7;
+ OptionsMap& o = *this;
+
+ o["Use Search Log"] = UCIOption(false);
+ o["Search Log Filename"] = UCIOption("SearchLog.txt");
+ o["Book File"] = UCIOption("book.bin");
+ o["Best Book Move"] = UCIOption(false);
+ o["Mobility (Middle Game)"] = UCIOption(100, 0, 200);
+ o["Mobility (Endgame)"] = UCIOption(100, 0, 200);
+ o["Passed Pawns (Middle Game)"] = UCIOption(100, 0, 200);
+ o["Passed Pawns (Endgame)"] = UCIOption(100, 0, 200);
+ o["Space"] = UCIOption(100, 0, 200);
+ o["Aggressiveness"] = UCIOption(100, 0, 200);
+ o["Cowardice"] = UCIOption(100, 0, 200);
+ o["Min Split Depth"] = UCIOption(msd, 4, 7);
+ o["Max Threads per Split Point"] = UCIOption(5, 4, 8);
+ o["Threads"] = UCIOption(cpus, 1, MAX_THREADS);
+ o["Use Sleeping Threads"] = UCIOption(true);
+ o["Hash"] = UCIOption(32, 4, 8192);
+ o["Clear Hash"] = UCIOption(false, "button");
+ o["Ponder"] = UCIOption(true);
+ o["OwnBook"] = UCIOption(true);
+ o["MultiPV"] = UCIOption(1, 1, 500);
+ o["Skill Level"] = UCIOption(20, 0, 20);
+ o["Emergency Move Horizon"] = UCIOption(40, 0, 50);
+ o["Emergency Base Time"] = UCIOption(200, 0, 30000);
+ o["Emergency Move Time"] = UCIOption(70, 0, 5000);
+ o["Minimum Thinking Time"] = UCIOption(20, 0, 5000);
+ o["UCI_Chess960"] = UCIOption(false);
+ o["UCI_AnalyseMode"] = UCIOption(false);
}
-/// get_option_value_bool() returns the current value of a UCI parameter of
-/// type "check".
+/// operator<<() is used to output all the UCI options in chronological insertion
+/// order (the idx field) and in the format defined by the UCI protocol.
+std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
-bool get_option_value_bool(const string& optionName) {
+ for (size_t idx = 0; idx < om.size(); idx++)
+ for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it)
+ if (it->second.idx == idx)
+ {
+ const UCIOption& o = it->second;
+ os << "\noption name " << it->first << " type " << o.type;
- return get_option_value(optionName);
-}
-
-
-/// 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.
+ if (o.type != "button")
+ os << " default " << o.defaultValue;
-int get_option_value_int(const string& optionName) {
+ if (o.type == "spin")
+ os << " min " << o.min << " max " << o.max;
- return get_option_value(optionName);
+ break;
+ }
+ return os;
}
-/// 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(optionName);
-}
+/// UCIOption class c'tors
+UCIOption::UCIOption(const char* v) : type("string"), min(0), max(0), idx(Options.size())
+{ defaultValue = currentValue = v; }
-/// set_option_value() inserts a new value for a UCI parameter
+UCIOption::UCIOption(bool v, string t) : type(t), min(0), max(0), idx(Options.size())
+{ defaultValue = currentValue = (v ? "true" : "false"); }
-void set_option_value(const string& name, const string& value) {
+UCIOption::UCIOption(int v, int minv, int maxv) : type("spin"), min(minv), max(maxv), idx(Options.size())
+{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
- if (options.find(name) == options.end())
- {
- cout << "No such option: " << name << endl;
- return;
- }
- // 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";
+/// UCIOption::operator=() updates currentValue. 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.
- // 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];
+void UCIOption::operator=(const string& v) {
- if (opt.type == CHECK && v != "0" && v != "1")
- return;
+ assert(!type.empty());
- if (opt.type == SPIN)
- {
- int val = atoi(v.c_str());
- if (val < opt.minValue || val > opt.maxValue)
- return;
- }
- opt.currentValue = v;
+ if ( !v.empty()
+ && (type == "check" || type == "button") == (v == "true" || v == "false")
+ && (type != "spin" || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
+ currentValue = v;
}