X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fucioption.cpp;h=80efb87a911f7a0449b6d961fc1266cedd216f5f;hb=5a7cdadfb31db2e8dcaf7be4ecc7953698cd7eef;hp=cc19e23610be28ed6879ff3d5ea095eb1dac031e;hpb=e5068c4734a9a8ba6f8cdb03ec787b76755d57b2;p=stockfish
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index cc19e236..80efb87a 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -1,13 +1,15 @@
/*
- Glaurung, a UCI chess playing engine.
- Copyright (C) 2004-2008 Tord Romstad
+ Stockfish, a UCI chess playing engine derived from Glaurung 2.1
+ Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
- Glaurung is free software: you can redistribute it and/or modify
+ Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
- Glaurung is distributed in the hope that it will be useful,
+ Stockfish is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -16,341 +18,160 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
+#include
#include
-#include
-#include
-#include
+#include
#include "misc.h"
+#include "search.h"
#include "thread.h"
-#include "ucioption.h"
-
-
-////
-//// Variables
-////
-
-bool Chess960 = false;
-
-
-////
-//// Local definitions
-////
-
-namespace {
-
- ///
- /// Types
- ///
-
- enum OptionType { SPIN, COMBO, CHECK, STRING, BUTTON, OPTION_TYPE_NONE };
-
- typedef std::vector ComboValues;
-
- struct Option
- {
- std::string name, defaultValue, currentValue;
- OptionType type;
- int minValue, maxValue;
- ComboValues comboValues;
-
- // Helper to convert a bool or an int to a std::string
- template std::string stringify(const T& v);
-
- Option(const char* name, const char* defaultValue, OptionType = STRING);
- Option(const char* name, bool defaultValue);
- Option(const char* name, int defaultValue, int minValue, int maxValue);
- };
-
- typedef std::vector Options;
-
- ///
- /// Constants
- ///
-
- // load-defaults populates the options map with the hard
- // coded options names and their default values.
- void load_defaults(Options& o) {
-
- o.push_back(Option("Use Search Log", false));
- o.push_back(Option("Search Log Filename", "SearchLog.txt"));
- o.push_back(Option("Book File", "book.bin"));
- o.push_back(Option("Mobility (Middle Game)", 100, 0, 200));
- o.push_back(Option("Mobility (Endgame)", 100, 0, 200));
- o.push_back(Option("Pawn Structure (Middle Game)", 100, 0, 200));
- o.push_back(Option("Pawn Structure (Endgame)", 100, 0, 200));
- o.push_back(Option("Passed Pawns (Middle Game)", 100, 0, 200));
- o.push_back(Option("Passed Pawns (Endgame)", 100, 0, 200));
- o.push_back(Option("Aggressiveness", 100, 0, 200));
- o.push_back(Option("Cowardice", 100, 0, 200));
- o.push_back(Option("King Safety Curve", "Quadratic", COMBO));
-
- o.back().comboValues.push_back("Quadratic");
- o.back().comboValues.push_back("Linear"); /*, "From File"*/
-
- o.push_back(Option("King Safety Coefficient", 40, 1, 100));
- o.push_back(Option("King Safety X Intercept", 0, 0, 20));
- o.push_back(Option("King Safety Max Slope", 30, 10, 100));
- o.push_back(Option("King Safety Max Value", 500, 100, 1000));
- o.push_back(Option("Queen Contact Check Bonus", 4, 0, 8));
- o.push_back(Option("Rook Contact Check Bonus", 2, 0, 4));
- o.push_back(Option("Queen Check Bonus", 2, 0, 4));
- o.push_back(Option("Rook Check Bonus", 1, 0, 4));
- o.push_back(Option("Bishop Check Bonus", 1, 0, 4));
- o.push_back(Option("Knight Check Bonus", 1, 0, 4));
- o.push_back(Option("Discovered Check Bonus", 3, 0, 8));
- o.push_back(Option("Mate Threat Bonus", 3, 0, 8));
- o.push_back(Option("Check Extension (PV nodes)", 2, 0, 2));
- o.push_back(Option("Check Extension (non-PV nodes)", 1, 0, 2));
- o.push_back(Option("Single Reply Extension (PV nodes)", 2, 0, 2));
- o.push_back(Option("Single Reply Extension (non-PV nodes)", 2, 0, 2));
- o.push_back(Option("Mate Threat Extension (PV nodes)", 2, 0, 2));
- o.push_back(Option("Mate Threat Extension (non-PV nodes)", 0, 0, 2));
- o.push_back(Option("Pawn Push to 7th Extension (PV nodes)", 1, 0, 2));
- o.push_back(Option("Pawn Push to 7th Extension (non-PV nodes)", 1, 0, 2));
- o.push_back(Option("Passed Pawn Extension (PV nodes)", 1, 0, 2));
- o.push_back(Option("Passed Pawn Extension (non-PV nodes)", 0, 0, 2));
- o.push_back(Option("Pawn Endgame Extension (PV nodes)", 2, 0, 2));
- o.push_back(Option("Pawn Endgame Extension (non-PV nodes)", 2, 0, 2));
- o.push_back(Option("Full Depth Moves (PV nodes)", 14, 1, 100));
- o.push_back(Option("Full Depth Moves (non-PV nodes)", 3, 1, 100));
- o.push_back(Option("Threat Depth", 5, 0, 100));
- o.push_back(Option("Selective Plies", 7, 0, 10));
- o.push_back(Option("Futility Pruning (Main Search)", true));
- o.push_back(Option("Futility Pruning (Quiescence Search)", true));
- o.push_back(Option("Futility Margin 0", 50, 0, 1000));
- o.push_back(Option("Futility Margin 1", 100, 0, 1000));
- o.push_back(Option("Futility Margin 2", 300, 0, 1000));
- o.push_back(Option("Maximum Razoring Depth", 3, 0, 4));
- o.push_back(Option("Razoring Margin", 300, 150, 600));
- o.push_back(Option("Randomness", 0, 0, 10));
- o.push_back(Option("Minimum Split Depth", 4, 4, 7));
- o.push_back(Option("Maximum Number of Threads per Split Point", 5, 4, 8));
- o.push_back(Option("Threads", 1, 1, 8));
- o.push_back(Option("Hash", 32, 4, 4096));
- o.push_back(Option("Clear Hash", false));
- o.push_back(Option("Ponder", true));
- o.push_back(Option("OwnBook", true));
- o.push_back(Option("MultiPV", 1, 1, 500));
- o.push_back(Option("UCI_ShowCurrLine", false));
- o.push_back(Option("UCI_Chess960", false));
- }
-
-
- ///
- /// Variables
- ///
-
- Options options;
-
- // Local functions
- template T get_option_value(const std::string& optionName);
- Options::iterator option_from_name(const std::string& optionName);
-
-}
-
-////
-//// Functions
-////
+#include "tt.h"
+#include "uci.h"
+#include "syzygy/tbprobe.h"
-/// init_uci_options() initializes the UCI options. Currently, the only
-/// thing this function does is to initialize the default value of the
-/// "Threads" parameter to the number of available CPU cores.
+using std::string;
-void init_uci_options() {
+UCI::OptionsMap Options; // Global object
- load_defaults(options);
+namespace UCI {
- // Limit the default value of "Threads" to 7 even if we have 8 CPU cores.
- // According to Ken Dail's tests, Glaurung plays much better with 7 than
- // with 8 threads. This is weird, but it is probably difficult to find out
- // why before I have a 8-core computer to experiment with myself.
- Options::iterator it = option_from_name("Threads");
+/// '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(o); }
+void on_logger(const Option& o) { start_logger(o); }
+void on_threads(const Option& o) { Threads.set(o); }
+void on_tb_path(const Option& o) { Tablebases::init(o); }
- assert(it != options.end());
- it->defaultValue = Min(cpu_count(), 7);
- it->currentValue = Min(cpu_count(), 7);
+/// Our case insensitive less() function as required by UCI protocol
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
- // Increase the minimum split depth when the number of CPUs is big.
- // It would probably be better to let this depend on the number of threads
- // instead.
- if(cpu_count() > 4)
- {
- it = option_from_name("Minimum Split Depth");
-
- assert(it != options.end());
-
- it->defaultValue = 6;
- it->currentValue = 6;
- }
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(),
+ [](char c1, char c2) { return tolower(c1) < tolower(c2); });
}
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in the format defined by the UCI protocol.
-
-void print_uci_options() {
-
- static const char optionTypeName[][16] = {
- "spin", "combo", "check", "string", "button"
- };
-
- for (Options::iterator it = options.begin(); it != options.end(); ++it)
- {
- std::cout << "option name " << it->name
- << " type " << optionTypeName[it->type];
-
- if (it->type != BUTTON)
- {
- std::cout << " default " << it->defaultValue;
-
- if (it->type == SPIN)
- std::cout << " min " << it->minValue
- << " max " << it->maxValue;
-
- else if (it->type == COMBO)
- for(ComboValues::iterator itc = it->comboValues.begin();
- itc != it->comboValues.end(); ++itc)
- std::cout << " var " << *itc;
- }
- std::cout << std::endl;
- }
-}
-
-/// get_option_value_bool() returns the current value of a UCI parameter of
-/// type "check".
-
-bool get_option_value_bool(const std::string& optionName) {
-
- return get_option_value(optionName);
+/// init() initializes the UCI options to their hard-coded default values
+
+void init(OptionsMap& o) {
+
+ // at most 2^32 clusters.
+ constexpr int MaxHashMB = Is64Bit ? 131072 : 2048;
+
+ o["Debug Log File"] << Option("", on_logger);
+ o["Contempt"] << Option(12, -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(30, 0, 5000);
+ o["Minimum Thinking Time"] << Option(20, 0, 5000);
+ o["Slow Mover"] << Option(84, 10, 1000);
+ o["nodestime"] << Option(0, 0, 10000);
+ o["UCI_Chess960"] << Option(false);
+ o["UCI_AnalyseMode"] << Option(false);
+ o["SyzygyPath"] << Option("", on_tb_path);
+ o["SyzygyProbeDepth"] << Option(1, 1, 100);
+ o["Syzygy50MoveRule"] << Option(true);
+ o["SyzygyProbeLimit"] << Option(6, 0, 6);
}
-/// get_option_value_int() returns the value of a UCI parameter as an integer.
-/// Normally, this function will be used for a parameter of type "spin", but
-/// it could also be used with a "combo" parameter, where all the available
-/// values are integers.
+/// 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.
-int get_option_value_int(const std::string& optionName) {
+std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
- return get_option_value(optionName);
-}
+ 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;
-/// get_option_value_string() returns the current value of a UCI parameter as
-/// a string. It is used with parameters of type "combo" and "string".
+ if (o.type == "spin")
+ os << " default " << int(stof(o.defaultValue))
+ << " min " << o.min
+ << " max " << o.max;
-const std::string get_option_value_string(const std::string& optionName) {
+ break;
+ }
- return get_option_value(optionName);
+ return os;
}
-/// button_was_pressed() tests whether a UCI parameter of type "button" has
-/// been selected since the last time the function was called.
-
-bool button_was_pressed(const std::string& buttonName) {
+/// Option class constructors and conversion operators
- if (get_option_value(buttonName))
- {
- set_option_value(buttonName, "false");
- return true;
- }
+Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), on_change(f)
+{ defaultValue = currentValue = v; }
- return false;
-}
+Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f)
+{ defaultValue = currentValue = (v ? "true" : "false"); }
+Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f)
+{}
-/// set_option_value() inserts a new value for a UCI parameter. Note that
-/// the function does not check that the new value is legal for the given
-/// parameter: This is assumed to be the responsibility of the GUI.
+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); }
-void set_option_value(const std::string& optionName,
- const std::string& newValue) {
+Option::Option(const char* v, const char* cur, OnChange f) : type("combo"), min(0), max(0), on_change(f)
+{ defaultValue = v; currentValue = cur; }
- Options::iterator it = option_from_name(optionName);
-
- if (it != options.end())
- it->currentValue = newValue;
- else
- std::cout << "No such option: " << optionName << std::endl;
+Option::operator double() const {
+ assert(type == "check" || type == "spin");
+ return (type == "spin" ? stof(currentValue) : currentValue == "true");
}
-
-/// push_button() is used to tell the engine that a UCI parameter of type
-/// "button" has been selected:
-
-void push_button(const std::string& buttonName) {
-
- set_option_value(buttonName, "true");
+Option::operator std::string() const {
+ assert(type == "string");
+ return currentValue;
}
+bool Option::operator==(const char* s) {
+ assert(type == "combo");
+ return !CaseInsensitiveLess()(currentValue, s)
+ && !CaseInsensitiveLess()(s, currentValue);
+}
-namespace {
-
- // methods and c'tors of Option class.
-
- template
- std::string Option::stringify(const T& v)
- {
- std::ostringstream ss;
- ss << v;
-
- return ss.str();
- }
-
- template<>
- std::string Option::stringify(const bool& v)
- {
- return v ? "true" : "false";
- }
-
- Option::Option(const char* nm, const char* def, OptionType t)
- : name(nm), defaultValue(def), currentValue(def), type(t), minValue(0), maxValue(0) {}
-
- Option::Option(const char* nm, bool def)
- : name(nm), defaultValue(stringify(def)), currentValue(stringify(def)), type(CHECK), minValue(0), maxValue(0) {}
-
- Option::Option(const char* nm, int def, int minv, int maxv)
- : name(nm), defaultValue(stringify(def)), currentValue(stringify(def)), type(SPIN), minValue(minv), maxValue(maxv) {}
+/// operator<<() inits options and assigns idx in the correct printing order
- // get_option_value is the implementation of the various
- // get_option_value_, because only the option value
- // type changes a template is the proper solution.
+void Option::operator<<(const Option& o) {
- template
- T get_option_value(const std::string& optionName) {
+ static size_t insert_order = 0;
- T ret;
+ *this = o;
+ idx = insert_order++;
+}
- Options::iterator it = option_from_name(optionName);
- if (it != options.end())
- {
- std::istringstream ss(it->currentValue);
- ss >> ret;
- }
- return ret;
- }
+/// 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.
+Option& Option::operator=(const string& v) {
- // option_from_name returns an iterator to the option
- // with name optionName.
+ assert(!type.empty());
- Options::iterator option_from_name(const std::string& optionName) {
+ if ( (type != "button" && v.empty())
+ || (type == "check" && v != "true" && v != "false")
+ || (type == "spin" && (stof(v) < min || stof(v) > max)))
+ return *this;
- for (Options::iterator it = options.begin(); it != options.end(); ++it)
- if (it->name == optionName)
- return it;
+ if (type != "button")
+ currentValue = v;
- return options.end();
- }
+ if (on_change)
+ on_change(*this);
+ return *this;
}
+
+} // namespace UCI