X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=9e718c02c89ca8a5670b555ed05ccca93fb9026a;hp=89e470585e0f0f8e3bf6073d80967895380981a3;hb=44c78fdb7ad4c82656f25e4da11f3f9d56a4c6aa;hpb=786564068bb22c750c41649733d4aa6733accaec
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 89e47058..9e718c02 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -17,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include
#include
@@ -33,26 +34,15 @@ 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++]);
+static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
- if (c1 != c2)
- return c1 < c2;
- }
- return s1.size() < s2.size();
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
}
-// 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;
@@ -68,52 +58,42 @@ OptionsMap::OptionsMap() {
OptionsMap& o = *this;
- 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["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["Use Sleeping Threads"] = Option(true);
- o["Hash"] = Option(32, 4, 8192);
- o["Clear Hash"] = Option(false, "button");
- o["Ponder"] = Option(true);
- o["OwnBook"] = Option(true);
- o["MultiPV"] = Option(1, 1, 500);
- o["Skill level"] = Option(20, 0, 20);
- o["Emergency Move Horizon"] = Option(40, 0, 50);
- o["Emergency Base Time"] = Option(200, 0, 30000);
- o["Emergency Move Time"] = Option(70, 0, 5000);
- o["Minimum Thinking Time"] = Option(20, 0, 5000);
- o["UCI_Chess960"] = Option(false);
- o["UCI_AnalyseMode"] = Option(false);
+ 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 = o["Threads"];
- Option& msd = o["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);
}
@@ -128,7 +108,7 @@ string OptionsMap::print_all() const {
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,21 +125,21 @@ string OptionsMap::print_all() const {
/// Option class c'tors
-Option::Option(const char* def) : type("string"), minValue(0), maxValue(0), idx(Options.size())
+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), minValue(0), maxValue(0), idx(Options.size())
+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"), minValue(minv), maxValue(maxv), idx(Options.size())
-{ 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& v) {
+void UCIOption::set_value(const string& v) {
assert(!type.empty());