X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=487778e5ad590b007dde1156f9a95eef6c09b559;hp=760d7df21561868a393f7ea4110ea309cda26040;hb=9ba7f701ead00fd4a59841d457d15a15d3b84378;hpb=c28b9ef182b4a0c3d0483654ebc2b2aca4fc731c
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 760d7df2..487778e5 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -17,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
@@ -28,9 +29,28 @@ 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
+
+// Our case insensitive less() function as required by UCI protocol
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+
+ int c1, c2;
+ size_t i = 0;
+
+ while (i < s1.size() && i < s2.size())
+ {
+ c1 = tolower(s1[i]);
+ c2 = tolower(s2[i++]);
+
+ if (c1 != c2)
+ return c1 < c2;
+ }
+ return s1.size() < s2.size();
+}
+
+
+// stringify() converts a numeric value of type T to a std::string
template
static string stringify(const T& v) {
@@ -61,8 +81,6 @@ void init_uci_options() {
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);
@@ -74,18 +92,17 @@ void init_uci_options() {
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 Master"] = Option(false);
+ Options["Use Sleeping Threads"] = Option(true);
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 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); // Just a dummy but needed by GUIs
+ Options["UCI_Chess960"] = Option(false);
Options["UCI_AnalyseMode"] = Option(false);
// Set some SMP parameters accordingly to the detected CPU count
@@ -99,76 +116,65 @@ void init_uci_options() {
}
-/// 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.
+/// options_to_uci() 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() {
-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)
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);
+ 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 class c'tors
-Option::Option(): type("UNDEFINED") {}
-
-Option::Option(const char* def, string t) : type(t), idx(Options.size()), minValue(0), maxValue(0)
+Option::Option(const char* def) : type("string"), idx(Options.size()), minValue(0), maxValue(0)
{ defaultValue = currentValue = def; }
Option::Option(bool def, string t) : type(t), idx(Options.size()), minValue(0), maxValue(0)
-{ defaultValue = currentValue = (def ? "1" : "0"); }
+{ 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); }
-// 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) {
- 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 (value.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")
+ != (value == "true" || value == "false"))
return;
if (type == "spin")
{
- int val = atoi(v.c_str());
- if (val < minValue || val > maxValue)
+ int v = atoi(value.c_str());
+ if (v < minValue || v > maxValue)
return;
}
- currentValue = v;
+
+ currentValue = value;
}