}
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
- return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
}
-/// OptionsMap c'tor initializes the UCI options to their hard coded default
+/// UCIOptions::init() initializes the UCI options to their hard coded default
/// values and initializes the default value of "Threads" and "Min Split Depth"
/// parameters according to the number of CPU cores detected.
-OptionsMap::OptionsMap() {
+void UCIOptions::init(OptionsMap& o) {
int cpus = std::min(cpu_count(), MAX_THREADS);
int msd = cpus < 8 ? 4 : 7;
- OptionsMap& o = *this;
o["Use Debug Log"] = UCIOption(false, on_logger);
o["Use Search Log"] = UCIOption(false);
o["Cowardice"] = UCIOption(100, 0, 200, on_eval);
o["Min Split Depth"] = UCIOption(msd, 4, 7, on_threads);
o["Max Threads per Split Point"] = UCIOption(5, 4, 8, on_threads);
- o["Threads"] = UCIOption(cpus, 1, MAX_THREADS);
+ o["Threads"] = UCIOption(cpus, 1, MAX_THREADS, on_threads);
o["Use Sleeping Threads"] = UCIOption(true, on_threads);
o["Hash"] = UCIOption(32, 4, 8192, on_hash_size);
o["Clear Hash"] = UCIOption(on_clear_hash);
/// check for option's limits, but we could receive the new value directly from
/// the user by console window, so let's check the bounds anyway.
-void UCIOption::operator=(const string& v) {
+UCIOption& UCIOption::operator=(const string& v) {
assert(!type.empty());
- if ( (type == "button" || !v.empty())
- && (type != "check" || (v == "true" || v == "false"))
- && (type != "spin" || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max)))
- {
- if (type != "button")
- currentValue = v;
+ if ( (type != "button" && v.empty())
+ || (type == "check" && v != "true" && v != "false")
+ || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max)))
+ return *this;
- if (on_change)
- (*on_change)(*this);
- }
+ if (type != "button")
+ currentValue = v;
+
+ if (on_change)
+ (*on_change)(*this);
+
+ return *this;
}