X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=1dfc474a9c0a3098ce82e0aa181dfb1bfa89195a;hp=cd7dc7396fe7b3edef283b509bc75ab1d5d2b7c1;hb=ce619b3b6ceb96bbf1e90f8281fdc89b9e64ec5e;hpb=41fe70d7031993d1802659d01dd0710477bffcab diff --git a/src/ucioption.cpp b/src/ucioption.cpp index cd7dc739..1dfc474a 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -50,9 +50,8 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const } -// stringify() converts a numeric value of type T to a std::string -template -static string stringify(const T& v) { +// An helper to convert an integer value to a std::string +static string int_to_string(int v) { std::ostringstream ss; ss << v; @@ -60,75 +59,65 @@ static string stringify(const T& v) { } -/// init_uci_options() initializes the UCI options to their hard coded default +/// OptionsMap c'tor initializes the UCI options to their hard coded default /// values and initializes the default value of "Threads" and "Minimum Split Depth" /// parameters according to the number of CPU cores. -void init_uci_options() { - - Options["Use Search Log"] = Option(false); - Options["Search Log Filename"] = Option("SearchLog.txt"); - Options["Book File"] = Option("book.bin"); - Options["Best Book Move"] = Option(false); - Options["Mobility (Middle Game)"] = Option(100, 0, 200); - Options["Mobility (Endgame)"] = Option(100, 0, 200); - Options["Pawn Structure (Middle Game)"] = Option(100, 0, 200); - Options["Pawn Structure (Endgame)"] = Option(100, 0, 200); - Options["Passed Pawns (Middle Game)"] = Option(100, 0, 200); - Options["Passed Pawns (Endgame)"] = Option(100, 0, 200); - Options["Space"] = Option(100, 0, 200); - Options["Aggressiveness"] = Option(100, 0, 200); - Options["Cowardice"] = Option(100, 0, 200); - Options["Check Extension (PV nodes)"] = Option(2, 0, 2); - Options["Check Extension (non-PV nodes)"] = Option(1, 0, 2); - Options["Mate Threat Extension (PV nodes)"] = Option(2, 0, 2); - Options["Mate Threat Extension (non-PV nodes)"] = Option(2, 0, 2); - Options["Pawn Push to 7th Extension (PV nodes)"] = Option(1, 0, 2); - Options["Pawn Push to 7th Extension (non-PV nodes)"] = Option(1, 0, 2); - Options["Passed Pawn Extension (PV nodes)"] = Option(1, 0, 2); - Options["Passed Pawn Extension (non-PV nodes)"] = Option(0, 0, 2); - Options["Pawn Endgame Extension (PV nodes)"] = Option(2, 0, 2); - Options["Pawn Endgame Extension (non-PV nodes)"] = Option(2, 0, 2); - Options["Minimum Split Depth"] = Option(4, 4, 7); - Options["Maximum Number of Threads per Split Point"] = Option(5, 4, 8); - Options["Threads"] = Option(1, 1, MAX_THREADS); - Options["Use Sleeping Threads"] = Option(true); - Options["Hash"] = Option(32, 4, 8192); - Options["Clear Hash"] = Option(false, "button"); - Options["Ponder"] = Option(true); - Options["OwnBook"] = Option(true); - Options["MultiPV"] = Option(1, 1, 500); - Options["Skill level"] = Option(10, 0, 10); - Options["Emergency Move Horizon"] = Option(40, 0, 50); - Options["Emergency Base Time"] = Option(200, 0, 30000); - Options["Emergency Move Time"] = Option(70, 0, 5000); - Options["Minimum Thinking Time"] = Option(20, 0, 5000); - Options["UCI_Chess960"] = Option(false); - Options["UCI_AnalyseMode"] = Option(false); +OptionsMap::OptionsMap() { + + 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["Minimum Split Depth"] = UCIOption(4, 4, 7); + o["Maximum Number of Threads per Split Point"] = UCIOption(5, 4, 8); + o["Threads"] = UCIOption(1, 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); // Set some SMP parameters accordingly to the detected CPU count - Option& thr = Options["Threads"]; - Option& msd = Options["Minimum Split Depth"]; + UCIOption& thr = o["Threads"]; + UCIOption& msd = o["Minimum Split Depth"]; - thr.defaultValue = thr.currentValue = stringify(cpu_count()); + thr.defaultValue = thr.currentValue = int_to_string(cpu_count()); if (cpu_count() >= 8) - msd.defaultValue = msd.currentValue = stringify(7); + msd.defaultValue = msd.currentValue = int_to_string(7); } -/// options_to_uci() returns a string with all the UCI options in chronological +/// OptionsMap::print_all() returns a string with all the UCI options in chronological /// insertion order (the idx field) and in the format defined by the UCI protocol. -string options_to_uci() { +string OptionsMap::print_all() const { std::stringstream s; - for (size_t i = 0; i <= Options.size(); i++) - for (OptionsMap::const_iterator it = Options.begin(); it != Options.end(); ++it) + for (size_t i = 0; i <= size(); i++) + for (OptionsMap::const_iterator it = begin(); it != end(); ++it) if (it->second.idx == i) { - const Option& o = it->second; + const UCIOption& o = it->second; s << "\noption name " << it->first << " type " << o.type; if (o.type != "button") @@ -145,37 +134,36 @@ string options_to_uci() { /// Option class c'tors -Option::Option(const char* def) : type("string"), idx(Options.size()), minValue(0), maxValue(0) +UCIOption::UCIOption(const char* def) : type("string"), minValue(0), maxValue(0), idx(Options.size()) { defaultValue = currentValue = def; } -Option::Option(bool def, string t) : type(t), idx(Options.size()), minValue(0), maxValue(0) +UCIOption::UCIOption(bool def, string t) : type(t), minValue(0), maxValue(0), idx(Options.size()) { defaultValue = currentValue = (def ? "true" : "false"); } -Option::Option(int def, int minv, int maxv) : type("spin"), idx(Options.size()), minValue(minv), maxValue(maxv) -{ defaultValue = currentValue = stringify(def); } +UCIOption::UCIOption(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size()) +{ defaultValue = currentValue = int_to_string(def); } /// set_value() updates currentValue of the Option object. 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. -void Option::set_value(const string& value) { +void UCIOption::set_value(const string& v) { assert(!type.empty()); - if (value.empty()) + if (v.empty()) return; - if ( (type == "check" || type == "button") - != (value == "true" || value == "false")) + if ((type == "check" || type == "button") != (v == "true" || v == "false")) return; if (type == "spin") { - int v = atoi(value.c_str()); - if (v < minValue || v > maxValue) + int val = atoi(v.c_str()); + if (val < minValue || val > maxValue) return; } - currentValue = value; + currentValue = v; }