X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fucioption.cpp;h=97cbe1a64684da2cddbcc86561bd19a7c1ff6063;hb=b5d5646c840d63710552fdaf2521a054dd3b8a18;hp=e6ce532aed924119af95234942adebe36a383e41;hpb=f57d51b7f3b5d97b7322aa7e4bd9025726a518e3;p=stockfish
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index e6ce532a..97cbe1a6 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -17,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
@@ -28,7 +29,25 @@ using std::string;
using std::cout;
using std::endl;
-OptionsMap Options;
+OptionsMap Options; // Global object
+
+
+// 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
@@ -62,10 +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);
Options["Pawn Push to 7th Extension (non-PV nodes)"] = Option(1, 0, 2);
Options["Passed Pawn Extension (PV nodes)"] = Option(1, 0, 2);
@@ -75,18 +90,18 @@ 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["Skill level"] = Option(20, 0, 20);
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
@@ -100,28 +115,29 @@ 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;
+ s << "\noption name " << it->first << " type " << o.type;
if (o.type != "button")
- cout << " default " << o.defaultValue;
+ s << " default " << o.defaultValue;
if (o.type == "spin")
- cout << " min " << o.minValue << " max " << o.maxValue;
+ s << " min " << o.minValue << " max " << o.maxValue;
break;
}
- cout << endl;
+ return s.str();
}
@@ -141,20 +157,23 @@ Option::Option(int def, int minv, int maxv) : type("spin"), idx(Options.size()),
/// 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 Option::set_value(const string& v) {
assert(!type.empty());
- if ( (type == "check" || type == "button")
- && !(value == "true" || value == "false"))
+ if (v.empty())
+ return;
+
+ 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;
}