X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fucioption.cpp;h=06641cf5081908aa04c804b4ba2e75c022cc2db2;hb=HEAD;hp=2184c692f91a878ae8fc6f568b5f349f87747922;hpb=441a34a1c6f4fb11223eb92821b487109059d947;p=stockfish
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 2184c692..455803cf 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-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2004-2024 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,146 +16,196 @@
along with this program. If not, see .
*/
+#include "ucioption.h"
+
#include
#include
-#include
+#include
+#include
#include
+#include
-#include "evaluate.h"
#include "misc.h"
-#include "thread.h"
-#include "tt.h"
-#include "ucioption.h"
-
-using std::string;
-
-UCI::OptionsMap Options; // Global object
-
-namespace UCI {
-/// 'On change' actions, triggered by an option's value change
-void on_logger(const Option& o) { start_logger(o); }
-void on_eval(const Option&) { Eval::init(); }
-void on_threads(const Option&) { Threads.read_uci_options(); }
-void on_hash_size(const Option& o) { TT.resize(o); }
-void on_clear_hash(const Option&) { TT.clear(); }
+namespace Stockfish {
+bool CaseInsensitiveLess::operator()(const std::string& s1, const std::string& s2) const {
-/// Our case insensitive less() function as required by UCI protocol
-bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
-
-bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
- return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
-}
-
-
-/// init() initializes the UCI options to their hard-coded default values
-
-void init(OptionsMap& o) {
-
- o["Write Debug Log"] = Option(false, on_logger);
- o["Write Search Log"] = Option(false);
- o["Search Log Filename"] = Option("SearchLog.txt");
- o["Book File"] = Option("book.bin");
- o["Best Book Move"] = Option(false);
- o["Contempt Factor"] = Option(0, -50, 50);
- o["Mobility (Midgame)"] = Option(100, 0, 200, on_eval);
- o["Mobility (Endgame)"] = Option(100, 0, 200, on_eval);
- o["Pawn Structure (Midgame)"] = Option(100, 0, 200, on_eval);
- o["Pawn Structure (Endgame)"] = Option(100, 0, 200, on_eval);
- o["Passed Pawns (Midgame)"] = Option(100, 0, 200, on_eval);
- o["Passed Pawns (Endgame)"] = Option(100, 0, 200, on_eval);
- o["Space"] = Option(100, 0, 200, on_eval);
- o["Aggressiveness"] = Option(100, 0, 200, on_eval);
- o["Cowardice"] = Option(100, 0, 200, on_eval);
- o["Min Split Depth"] = Option(0, 0, 12, on_threads);
- o["Threads"] = Option(1, 1, MAX_THREADS, on_threads);
- o["Idle Threads Sleep"] = Option(true);
- o["Hash"] = Option(32, 1, 16384, on_hash_size);
- o["Clear Hash"] = Option(on_clear_hash);
- o["Ponder"] = Option(true);
- o["OwnBook"] = Option(false);
- 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(60, 0, 30000);
- o["Emergency Move Time"] = Option(30, 0, 5000);
- o["Minimum Thinking Time"] = Option(20, 0, 5000);
- o["Slow Mover"] = Option(80, 10, 1000);
- o["UCI_Chess960"] = Option(false);
+ return std::lexicographical_compare(
+ s1.begin(), s1.end(), s2.begin(), s2.end(),
+ [](char c1, char c2) { return std::tolower(c1) < std::tolower(c2); });
}
+void OptionsMap::add_info_listener(InfoListener&& message_func) { info = std::move(message_func); }
-/// 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.
+void OptionsMap::setoption(std::istringstream& is) {
+ std::string token, name, value;
-std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
+ is >> token; // Consume the "name" token
- for (size_t idx = 0; idx < om.size() + 1; ++idx) // idx could start from 1
- for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it)
- if (it->second.idx == idx)
- {
- const Option& o = it->second;
- os << "\noption name " << it->first << " type " << o.type;
+ // Read the option name (can contain spaces)
+ while (is >> token && token != "value")
+ name += (name.empty() ? "" : " ") + token;
- if (o.type != "button")
- os << " default " << o.defaultValue;
+ // Read the option value (can contain spaces)
+ while (is >> token)
+ value += (value.empty() ? "" : " ") + token;
- if (o.type == "spin")
- os << " min " << o.min << " max " << o.max;
+ if (options_map.count(name))
+ options_map[name] = value;
+ else
+ sync_cout << "No such option: " << name << sync_endl;
+}
- break;
- }
- return os;
+Option OptionsMap::operator[](const std::string& name) const {
+ auto it = options_map.find(name);
+ return it != options_map.end() ? it->second : Option(this);
}
+Option& OptionsMap::operator[](const std::string& name) {
+ if (!options_map.count(name))
+ options_map[name] = Option(this);
+ return options_map[name];
+}
-/// Option class constructors and conversion operators
+std::size_t OptionsMap::count(const std::string& name) const { return options_map.count(name); }
-Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f)
-{ defaultValue = currentValue = v; }
+Option::Option(const OptionsMap* map) :
+ parent(map) {}
-Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f)
-{ defaultValue = currentValue = (v ? "true" : "false"); }
+Option::Option(const char* v, OnChange f) :
+ type("string"),
+ min(0),
+ max(0),
+ on_change(std::move(f)) {
+ defaultValue = currentValue = v;
+}
-Option::Option(OnChange f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f)
-{}
+Option::Option(bool v, OnChange f) :
+ type("check"),
+ min(0),
+ max(0),
+ on_change(std::move(f)) {
+ defaultValue = currentValue = (v ? "true" : "false");
+}
-Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f)
-{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
+Option::Option(OnChange f) :
+ type("button"),
+ min(0),
+ max(0),
+ on_change(std::move(f)) {}
+
+Option::Option(double v, int minv, int maxv, OnChange f) :
+ type("spin"),
+ min(minv),
+ max(maxv),
+ on_change(std::move(f)) {
+ defaultValue = currentValue = std::to_string(v);
+}
+Option::Option(const char* v, const char* cur, OnChange f) :
+ type("combo"),
+ min(0),
+ max(0),
+ on_change(std::move(f)) {
+ defaultValue = v;
+ currentValue = cur;
+}
Option::operator int() const {
- assert(type == "check" || type == "spin");
- return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
+ assert(type == "check" || type == "spin");
+ return (type == "spin" ? std::stoi(currentValue) : currentValue == "true");
}
Option::operator std::string() const {
- assert(type == "string");
- return currentValue;
+ assert(type == "string");
+ return currentValue;
}
+bool Option::operator==(const char* s) const {
+ assert(type == "combo");
+ return !CaseInsensitiveLess()(currentValue, s) && !CaseInsensitiveLess()(s, currentValue);
+}
-/// 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 from
-/// the user by console window, so let's check the bounds anyway.
+bool Option::operator!=(const char* s) const { return !(*this == s); }
-Option& Option::operator=(const string& v) {
- assert(!type.empty());
+// Inits options and assigns idx in the correct printing order
- 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;
+void Option::operator<<(const Option& o) {
- if (type != "button")
- currentValue = v;
+ static size_t insert_order = 0;
- if (on_change)
- on_change(*this);
+ auto p = this->parent;
+ *this = o;
- return *this;
+ this->parent = p;
+ idx = insert_order++;
}
-} // namespace UCI
+// 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
+// from the user by console window, so let's check the bounds anyway.
+Option& Option::operator=(const std::string& v) {
+
+ assert(!type.empty());
+
+ if ((type != "button" && type != "string" && v.empty())
+ || (type == "check" && v != "true" && v != "false")
+ || (type == "spin" && (std::stof(v) < min || std::stof(v) > max)))
+ return *this;
+
+ if (type == "combo")
+ {
+ OptionsMap comboMap; // To have case insensitive compare
+ std::string token;
+ std::istringstream ss(defaultValue);
+ while (ss >> token)
+ comboMap[token] << Option();
+ if (!comboMap.count(v) || v == "var")
+ return *this;
+ }
+
+ if (type == "string")
+ currentValue = v == "" ? "" : v;
+ else if (type != "button")
+ currentValue = v;
+
+ if (on_change)
+ {
+ const auto ret = on_change(*this);
+
+ if (ret && parent != nullptr && parent->info != nullptr)
+ parent->info(ret);
+ }
+
+ return *this;
+}
+
+std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
+ for (size_t idx = 0; idx < om.options_map.size(); ++idx)
+ for (const auto& it : om.options_map)
+ if (it.second.idx == idx)
+ {
+ const Option& o = it.second;
+ os << "\noption name " << it.first << " type " << o.type;
+
+ if (o.type == "check" || o.type == "combo")
+ os << " default " << o.defaultValue;
+
+ else if (o.type == "string")
+ {
+ std::string defaultValue = o.defaultValue.empty() ? "" : o.defaultValue;
+ os << " default " << defaultValue;
+ }
+
+ else if (o.type == "spin")
+ os << " default " << int(stof(o.defaultValue)) << " min " << o.min << " max "
+ << o.max;
+
+ break;
+ }
+
+ return os;
+}
+}