X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fucioption.cpp;h=132760c9499dd4fad6c282414ea7c5f1fc85e6e5;hb=a492a9dd079d95faf136a744ff6d47a3d109ad68;hp=89e470585e0f0f8e3bf6073d80967895380981a3;hpb=786564068bb22c750c41649733d4aa6733accaec;p=stockfish
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 89e47058..132760c9 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,8 +17,7 @@
along with this program. If not, see .
*/
-#include
-#include
+#include
#include
#include "misc.h"
@@ -26,155 +25,103 @@
#include "ucioption.h"
using std::string;
-using std::cout;
-using std::endl;
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
-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); }
- std::ostringstream ss;
- ss << v;
- return ss.str();
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+ return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
}
/// 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.
+/// values and initializes the default value of "Threads" and "Min Split Depth"
+/// parameters according to the number of CPU cores detected.
OptionsMap::OptionsMap() {
+ int cpus = std::min(cpu_count(), MAX_THREADS);
+ int msd = cpus < 8 ? 4 : 7;
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);
-
- // Set some SMP parameters accordingly to the detected CPU count
- Option& thr = o["Threads"];
- Option& msd = o["Minimum Split Depth"];
-
- thr.defaultValue = thr.currentValue = stringify(cpu_count());
-
- if (cpu_count() >= 8)
- msd.defaultValue = msd.currentValue = stringify(7);
+ 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["Min Split Depth"] = UCIOption(msd, 4, 7);
+ o["Max Threads per Split Point"] = UCIOption(5, 4, 8);
+ o["Threads"] = UCIOption(cpus, 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);
}
-/// 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 {
-
- std::stringstream s;
+/// operator<<() is used to output all the UCI options in chronological insertion
+/// order (the idx field) and in the format defined by the UCI protocol.
+std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
- for (size_t i = 0; i <= size(); i++)
- for (OptionsMap::const_iterator it = begin(); it != end(); ++it)
- if (it->second.idx == i)
+ for (size_t idx = 0; idx < om.size(); idx++)
+ for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it)
+ if (it->second.idx == idx)
{
- const Option& o = it->second;
- s << "\noption name " << it->first << " type " << o.type;
+ const UCIOption& o = it->second;
+ os << "\noption name " << it->first << " type " << o.type;
if (o.type != "button")
- s << " default " << o.defaultValue;
+ os << " default " << o.defaultValue;
if (o.type == "spin")
- s << " min " << o.minValue << " max " << o.maxValue;
+ os << " min " << o.min << " max " << o.max;
break;
}
- return s.str();
+ return os;
}
-/// Option class c'tors
+/// UCIOption class c'tors
-Option::Option(const char* def) : type("string"), minValue(0), maxValue(0), idx(Options.size())
-{ defaultValue = currentValue = def; }
+UCIOption::UCIOption(const char* v) : type("string"), min(0), max(0), idx(Options.size())
+{ defaultValue = currentValue = v; }
-Option::Option(bool def, string t) : type(t), minValue(0), maxValue(0), idx(Options.size())
-{ defaultValue = currentValue = (def ? "true" : "false"); }
+UCIOption::UCIOption(bool v, string t) : type(t), min(0), max(0), idx(Options.size())
+{ defaultValue = currentValue = (v ? "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 v, int minv, int maxv) : type("spin"), min(minv), max(maxv), idx(Options.size())
+{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
-/// 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.
+/// UCIOption::operator=() updates currentValue. 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::operator=(const string& v) {
assert(!type.empty());
- if (v.empty())
- return;
-
- if ((type == "check" || type == "button") != (v == "true" || v == "false"))
- return;
-
- if (type == "spin")
- {
- int val = atoi(v.c_str());
- if (val < minValue || val > maxValue)
- return;
- }
-
- currentValue = v;
+ if ( !v.empty()
+ && (type == "check" || type == "button") == (v == "true" || v == "false")
+ && (type != "spin" || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
+ currentValue = v;
}