X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fucioption.cpp;h=5e747a7f13fdda58c953209c19c1b9be7470e8eb;hb=0e1f734b05ee5c67e9a17ae0e2045a64209dee05;hp=a8b34c7021c27e05d4545bd22e5e3fb648320e18;hpb=ccd5ccbcdbfd7bc1521fe194a970ab1c6a4b55fe;p=stockfish
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index a8b34c70..5e747a7f 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -1,7 +1,6 @@
/*
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) 2004-2020 The Stockfish developers (see AUTHORS file)
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,156 +16,177 @@
along with this program. If not, see .
*/
-#include
-#include
+#include
+#include
+#include
#include
+#include "evaluate.h"
#include "misc.h"
+#include "search.h"
#include "thread.h"
-#include "ucioption.h"
+#include "tt.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
using std::string;
-using std::cout;
-using std::endl;
-OptionsMap Options; // Global object
+UCI::OptionsMap Options; // Global object
+namespace UCI {
-// Our case insensitive less() function as required by UCI protocol
+/// 'On change' actions, triggered by an option's value change
+void on_clear_hash(const Option&) { Search::clear(); }
+void on_hash_size(const Option& o) { TT.resize(size_t(o)); }
+void on_logger(const Option& o) { start_logger(o); }
+void on_threads(const Option& o) { Threads.set(size_t(o)); }
+void on_tb_path(const Option& o) { Tablebases::init(o); }
+void on_use_NNUE(const Option& ) { Eval::init_NNUE(); }
+void on_eval_file(const Option& ) { Eval::init_NNUE(); }
+
+/// 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;
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(),
+ [](char c1, char c2) { return tolower(c1) < tolower(c2); });
+}
- 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();
+/// UCI::init() initializes the UCI options to their hard-coded default values
+
+void init(OptionsMap& o) {
+
+ constexpr int MaxHashMB = Is64Bit ? 33554432 : 2048;
+
+ o["Debug Log File"] << Option("", on_logger);
+ o["Contempt"] << Option(24, -100, 100);
+ o["Analysis Contempt"] << Option("Both var Off var White var Black var Both", "Both");
+ o["Threads"] << Option(1, 1, 512, on_threads);
+ o["Hash"] << Option(16, 1, MaxHashMB, on_hash_size);
+ o["Clear Hash"] << Option(on_clear_hash);
+ o["Ponder"] << Option(false);
+ o["MultiPV"] << Option(1, 1, 500);
+ o["Skill Level"] << Option(20, 0, 20);
+ o["Move Overhead"] << Option(10, 0, 5000);
+ o["Slow Mover"] << Option(100, 10, 1000);
+ o["nodestime"] << Option(0, 0, 10000);
+ o["UCI_Chess960"] << Option(false);
+ o["UCI_AnalyseMode"] << Option(false);
+ o["UCI_LimitStrength"] << Option(false);
+ o["UCI_Elo"] << Option(1350, 1350, 2850);
+ o["UCI_ShowWDL"] << Option(false);
+ o["SyzygyPath"] << Option("", on_tb_path);
+ o["SyzygyProbeDepth"] << Option(1, 1, 100);
+ o["Syzygy50MoveRule"] << Option(true);
+ o["SyzygyProbeLimit"] << Option(7, 0, 7);
+ o["Use NNUE"] << Option(true, on_use_NNUE);
+ o["EvalFile"] << Option(EvalFileDefaultName, on_eval_file);
}
-// stringify() converts a numeric value of type T to a std::string
-template
-static string stringify(const T& v) {
+/// operator<<() is used to print all the options default values in chronological
+/// insertion order (the idx field) and in the format defined by the UCI protocol.
- std::ostringstream ss;
- ss << v;
- return ss.str();
-}
+std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
+
+ for (size_t idx = 0; idx < om.size(); ++idx)
+ for (const auto& it : om)
+ if (it.second.idx == idx)
+ {
+ const Option& o = it.second;
+ os << "\noption name " << it.first << " type " << o.type;
+
+ if (o.type == "string" || o.type == "check" || o.type == "combo")
+ os << " default " << o.defaultValue;
+ if (o.type == "spin")
+ os << " default " << int(stof(o.defaultValue))
+ << " min " << o.min
+ << " max " << o.max;
-/// 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.
-
-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["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);
+ break;
+ }
+
+ return os;
}
-/// 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.
+/// Option class constructors and conversion operators
-string OptionsMap::print_all() const {
+Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), on_change(f)
+{ defaultValue = currentValue = v; }
- std::stringstream s;
+Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f)
+{ defaultValue = currentValue = (v ? "true" : "false"); }
- for (size_t i = 0; i <= size(); i++)
- for (OptionsMap::const_iterator it = begin(); it != end(); ++it)
- if (it->second.idx == i)
- {
- const Option& o = it->second;
- s << "\noption name " << it->first << " type " << o.type;
+Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f)
+{}
- if (o.type != "button")
- s << " default " << o.defaultValue;
+Option::Option(double v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f)
+{ defaultValue = currentValue = std::to_string(v); }
- if (o.type == "spin")
- s << " min " << o.minValue << " max " << o.maxValue;
+Option::Option(const char* v, const char* cur, OnChange f) : type("combo"), min(0), max(0), on_change(f)
+{ defaultValue = v; currentValue = cur; }
- break;
- }
- return s.str();
+Option::operator double() const {
+ assert(type == "check" || type == "spin");
+ return (type == "spin" ? stof(currentValue) : currentValue == "true");
}
+Option::operator std::string() const {
+ assert(type == "string");
+ return currentValue;
+}
-/// Option class c'tors
+bool Option::operator==(const char* s) const {
+ assert(type == "combo");
+ return !CaseInsensitiveLess()(currentValue, s)
+ && !CaseInsensitiveLess()(s, currentValue);
+}
-Option::Option(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())
-{ defaultValue = currentValue = (def ? "true" : "false"); }
+/// operator<<() inits options and assigns idx in the correct printing order
-Option::Option(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size())
-{ defaultValue = currentValue = stringify(def); }
+void Option::operator<<(const Option& o) {
+ static size_t insert_order = 0;
-/// set_value() updates currentValue of the Option object. Normally it's up to
+ *this = o;
+ idx = insert_order++;
+}
+
+
+/// operator=() updates currentValue and triggers on_change() action. 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.
+/// from the user by console window, so let's check the bounds anyway.
-void Option::set_value(const string& v) {
+Option& Option::operator=(const string& v) {
assert(!type.empty());
- if (v.empty())
- return;
-
- if ((type == "check" || type == "button") != (v == "true" || v == "false"))
- return;
+ if ( (type != "button" && v.empty())
+ || (type == "check" && v != "true" && v != "false")
+ || (type == "spin" && (stof(v) < min || stof(v) > max)))
+ return *this;
- if (type == "spin")
+ if (type == "combo")
{
- int val = atoi(v.c_str());
- if (val < minValue || val > maxValue)
- return;
+ OptionsMap comboMap; // To have case insensitive compare
+ string token;
+ std::istringstream ss(defaultValue);
+ while (ss >> token)
+ comboMap[token] << Option();
+ if (!comboMap.count(v) || v == "var")
+ return *this;
}
- currentValue = v;
+ if (type != "button")
+ currentValue = v;
+
+ if (on_change)
+ on_change(*this);
+
+ return *this;
}
+
+} // namespace UCI