X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=9e718c02c89ca8a5670b555ed05ccca93fb9026a;hp=b1b849807ff507c792198a4855dc9d5d1b9a61c0;hb=44c78fdb7ad4c82656f25e4da11f3f9d56a4c6aa;hpb=287556f97d54c87b3a973e22e133a9d09b62676f
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index b1b84980..9e718c02 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -17,6 +17,8 @@
along with this program. If not, see .
*/
+#include
+#include
#include
#include
@@ -28,11 +30,19 @@ using std::string;
using std::cout;
using std::endl;
-OptionsMap Options;
+OptionsMap Options; // Global object
-// stringify() converts a value of type T to a std::string
-template
-static string stringify(const T& v) {
+
+// Our case insensitive less() function as required by UCI protocol
+static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
+
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
+}
+
+
+// An helper to convert an integer value to a std::string
+static string int_to_string(int v) {
std::ostringstream ss;
ss << v;
@@ -40,127 +50,103 @@ 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["Single Evasion Extension (PV nodes)"] = Option(2, 0, 2);
- Options["Single Evasion Extension (non-PV nodes)"] = Option(2, 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["Hash"] = Option(32, 4, 8192);
- Options["Clear Hash"] = Option(false, "button");
- Options["New Game"] = Option(false, "button");
- Options["Ponder"] = Option(true);
- Options["OwnBook"] = Option(true);
- Options["MultiPV"] = Option(1, 1, 500);
- Options["Emergency Move Horizon"] = Option(40, 0, 50);
- Options["Emergency Base Time"] = Option(200, 0, 60000);
- Options["Emergency Move Time"] = Option(70, 0, 5000);
- Options["Minimum Thinking Time"] = Option(20, 0, 5000);
- Options["UCI_Chess960"] = Option(false); // Just a dummy but needed by GUIs
- 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);
}
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in chronological insertion order (the idx field) and in the format
-/// defined by the UCI protocol.
+/// 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 OptionsMap::print_all() const {
-void print_uci_options() {
+ 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;
- cout << "\noption name " << it->first << " type " << o.type;
-
- if (o.type == "check")
- cout << " default " << (o.defaultValue == "1" ? "true" : "false");
- else if (o.type == "string")
- cout << " default " << o.defaultValue;
- else if (o.type == "spin")
- {
- cout << " default " << o.defaultValue
- << " min " << o.minValue << " max " << o.maxValue;
- }
- else if (o.type != "button")
- assert(false);
+ const UCIOption& o = it->second;
+ s << "\noption name " << it->first << " type " << o.type;
+
+ if (o.type != "button")
+ s << " default " << o.defaultValue;
+
+ if (o.type == "spin")
+ s << " min " << o.minValue << " max " << o.maxValue;
break;
}
- cout << endl;
+ return s.str();
}
-// Option class c'tors
-
-Option::Option(): type("UNDEFINED") {}
+/// Option class c'tors
-Option::Option(const char* def, string t) : type(t), 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)
-{ defaultValue = currentValue = (def ? "1" : "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 to the passed value
+/// 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 != "UNDEFINED");
+ assert(!type.empty());
- // 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";
+ if (v.empty())
+ return;
- // 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.
- if (type == "check" && v != "0" && v != "1")
+ if ((type == "check" || type == "button") != (v == "true" || v == "false"))
return;
if (type == "spin")
@@ -169,5 +155,6 @@ void Option::set_value(const string& value) {
if (val < minValue || val > maxValue)
return;
}
+
currentValue = v;
}