X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fucioption.cpp;h=eae549ad63f413b077ea9d6828cf6887ea86be54;hb=699bae632f283746a3eee15c0950fcdbca8a355e;hp=9e992be55c26e7fd50462fb4ac5748393d37862e;hpb=f0701e2b0f4283ba558e7d8cab8e41cf11a19cdd;p=stockfish diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 9e992be5..5889ef6b 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 Marco Costalba + Copyright (C) 2004-2021 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,332 +16,191 @@ along with this program. If not, see . */ - -//// -//// Includes -//// - +#include #include -#include -#include +#include #include -#include +#include "evaluate.h" #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 }; - - typedef std::vector ComboValues; - - struct Option { - - std::string defaultValue, currentValue; - OptionType type; - int minValue, maxValue; - ComboValues comboValues; - - Option(); - Option(const std::string& defaultValue, OptionType = STRING); - Option(bool defaultValue, OptionType = CHECK); - Option(int defaultValue, int minValue, int maxValue); - }; - - typedef std::map Options; - - /// - /// Constants - /// - - // load_defaults populates the options map with the hard - // coded names and default values. - - void load_defaults(Options& o) { - - o["Use Search Log"] = Option(false); - o["Search Log Filename"] = Option("SearchLog.txt"); - o["Book File"] = Option("book.bin"); - 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["King Safety Curve"] = Option("Quadratic", COMBO); - - o["King Safety Curve"].comboValues.push_back("Quadratic"); - o["King Safety Curve"].comboValues.push_back("Linear"); /*, "From File"*/ - - o["King Safety Coefficient"] = Option(40, 1, 100); - o["King Safety X Intercept"] = Option(0, 0, 20); - o["King Safety Max Slope"] = Option(30, 10, 100); - o["King Safety Max Value"] = Option(500, 100, 1000); - o["Queen Contact Check Bonus"] = Option(3, 0, 8); - o["Queen Check Bonus"] = Option(2, 0, 4); - o["Rook Check Bonus"] = Option(1, 0, 4); - o["Bishop Check Bonus"] = Option(1, 0, 4); - o["Knight Check Bonus"] = Option(1, 0, 4); - o["Discovered Check Bonus"] = Option(3, 0, 8); - o["Mate Threat Bonus"] = Option(3, 0, 8); - o["Check Extension (PV nodes)"] = Option(2, 0, 2); - o["Check Extension (non-PV nodes)"] = Option(1, 0, 2); - o["Single Reply Extension (PV nodes)"] = Option(2, 0, 2); - o["Single Reply Extension (non-PV nodes)"] = Option(2, 0, 2); - o["Mate Threat Extension (PV nodes)"] = Option(0, 0, 2); - o["Mate Threat Extension (non-PV nodes)"] = Option(0, 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["Full Depth Moves (PV nodes)"] = Option(14, 1, 100); - o["Full Depth Moves (non-PV nodes)"] = Option(3, 1, 100); - o["Threat Depth"] = Option(5, 0, 100); - o["Selective Plies"] = Option(7, 0, 10); - o["Futility Pruning (Main Search)"] = Option(true); - o["Futility Pruning (Quiescence Search)"] = Option(true); - o["Futility Margin (Quiescence Search)"] = Option(50, 0, 1000); - o["Futility Margin Scale Factor (Main Search)"] = Option(100, 0, 1000); - o["Maximum Razoring Depth"] = Option(3, 0, 4); - o["Razoring Margin"] = Option(300, 150, 600); - o["LSN filtering"] = Option(true); - o["LSN Time Margin (sec)"] = Option(4, 1, 10); - o["LSN Value Margin"] = Option(200, 100, 600); - o["Randomness"] = Option(0, 0, 10); - 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, 8); - o["Hash"] = Option(32, 4, 4096); - o["Clear Hash"] = Option(false, BUTTON); - o["Ponder"] = Option(true); - o["OwnBook"] = Option(true); - o["MultiPV"] = Option(1, 1, 500); - o["UCI_ShowCurrLine"] = Option(false); - o["UCI_Chess960"] = Option(false); - } - - /// - /// Variables - /// - - Options options; +#include "tt.h" +#include "uci.h" +#include "hashprobe.h" +#include "syzygy/tbprobe.h" + +using std::string; + +namespace Stockfish { + +UCI::OptionsMap Options; // Global object +std::unique_ptr hash_probe_thread; + +namespace UCI { + +/// '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::NNUE::init(); } +void on_eval_file(const Option& ) { Eval::NNUE::init(); } +void on_rpc_server_address(const Option& o) { + if (hash_probe_thread) { + hash_probe_thread->Shutdown(); + } + std::string addr = o; + hash_probe_thread.reset(new HashProbeThread(addr)); +} - // stringify converts a value of type T to a std::string - template - std::string stringify(const T& v) { +/// Our case insensitive less() function as required by UCI protocol +bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { - std::ostringstream ss; - ss << v; - return ss.str(); - } + return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), + [](char c1, char c2) { return tolower(c1) < tolower(c2); }); +} - // We want conversion from a bool value to be "true" or "false", - // not "1" or "0", so add a specialization for bool type. - template<> - std::string stringify(const bool& v) { - return v ? "true" : "false"; - } +/// 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); + o["RPCServerAddress"] << Option("", on_rpc_server_address); +} - // get_option_value implements the various get_option_value_ - // functions defined later, because only the option value - // type changes a template seems a proper solution. - template - T get_option_value(const std::string& optionName) { +/// 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. - T ret = T(); - if (options.find(optionName) == options.end()) - return ret; +std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { - std::istringstream ss(options[optionName].currentValue); - ss >> ret; - return ret; - } + 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; - // Unfortunatly we need a specialization to convert "false" and "true" - // to proper bool values. The culprit is that we use a non standard way - // to store a bool value in a string, in particular we use "false" and - // "true" instead of "0" and "1" due to how UCI protocol works. + if (o.type == "string" || o.type == "check" || o.type == "combo") + os << " default " << o.defaultValue; - template<> - bool get_option_value(const std::string& optionName) { + if (o.type == "spin") + os << " default " << int(stof(o.defaultValue)) + << " min " << o.min + << " max " << o.max; - if (options.find(optionName) == options.end()) - return false; + break; + } - return options[optionName].currentValue == "true"; - } + return os; } -//// -//// Functions -//// - -/// 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. - -void init_uci_options() { - - load_defaults(options); - - // 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. - assert(options.find("Threads") != options.end()); - assert(options.find("Minimum Split Depth") != options.end()); - options["Threads"].defaultValue = stringify(Min(cpu_count(), 7)); - options["Threads"].currentValue = stringify(Min(cpu_count(), 7)); +/// Option class constructors and conversion operators - // 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) - { - options["Minimum Split Depth"].defaultValue = "6"; - options["Minimum Split Depth"].currentValue = "6"; - } -} +Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), on_change(f) +{ defaultValue = currentValue = v; } +Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f) +{ defaultValue = currentValue = (v ? "true" : "false"); } -/// print_uci_options() prints all the UCI options to the standard output, -/// in the format defined by the UCI protocol. +Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f) +{} -void print_uci_options() { +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); } - static const char optionTypeName[][16] = { - "spin", "combo", "check", "string", "button" - }; +Option::Option(const char* v, const char* cur, OnChange f) : type("combo"), min(0), max(0), on_change(f) +{ defaultValue = v; currentValue = cur; } - for (Options::const_iterator it = options.begin(); it != options.end(); ++it) - { - const Option& o = it->second; - std::cout << "option name " << it->first - << " type " << optionTypeName[o.type]; - - if (o.type != BUTTON) - { - std::cout << " default " << o.defaultValue; - - if (o.type == SPIN) - std::cout << " min " << o.minValue - << " max " << o.maxValue; - - else if (o.type == COMBO) - for (ComboValues::const_iterator itc = o.comboValues.begin(); - itc != o.comboValues.end(); ++itc) - std::cout << " var " << *itc; - } - std::cout << std::endl; - } +Option::operator double() const { + assert(type == "check" || type == "spin"); + return (type == "spin" ? stof(currentValue) : currentValue == "true"); } - -/// 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); +Option::operator std::string() const { + assert(type == "string"); + return currentValue; } - -/// 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. - -int get_option_value_int(const std::string& optionName) { - - return get_option_value(optionName); +bool Option::operator==(const char* s) const { + assert(type == "combo"); + return !CaseInsensitiveLess()(currentValue, s) + && !CaseInsensitiveLess()(s, currentValue); } -/// 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". - -const std::string get_option_value_string(const std::string& optionName) { - - return get_option_value(optionName); -} - +/// operator<<() inits options and assigns idx in the correct printing order -/// 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. +void Option::operator<<(const Option& o) { -void set_option_value(const std::string& optionName, - const std::string& newValue) { + static size_t insert_order = 0; - if (options.find(optionName) != options.end()) - options[optionName].currentValue = newValue; - else - std::cout << "No such option: " << optionName << std::endl; + *this = o; + idx = insert_order++; } -/// push_button() is used to tell the engine that a UCI parameter of type -/// "button" has been selected: +/// 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. -void push_button(const std::string& buttonName) { +Option& Option::operator=(const string& v) { - set_option_value(buttonName, "true"); -} + assert(!type.empty()); + if ( (type != "button" && v.empty()) + || (type == "check" && v != "true" && v != "false") + || (type == "spin" && (stof(v) < min || stof(v) > max))) + return *this; -/// button_was_pressed() tests whether a UCI parameter of type "button" has -/// been selected since the last time the function was called, in this case -/// it also resets the button. + if (type == "combo") + { + 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; + } -bool button_was_pressed(const std::string& buttonName) { + if (type != "button") + currentValue = v; - if (!get_option_value(buttonName)) - return false; + if (on_change) + on_change(*this); - set_option_value(buttonName, "false"); - return true; + return *this; } +} // namespace UCI -namespace { - - // Define constructors of Option class. - - Option::Option() {} // To allow insertion in a std::map - - Option::Option(const std::string& def, OptionType t) - : defaultValue(def), currentValue(def), type(t), minValue(0), maxValue(0) {} - - Option::Option(bool def, OptionType t) - : defaultValue(stringify(def)), currentValue(stringify(def)), type(t), minValue(0), maxValue(0) {} - - Option::Option(int def, int minv, int maxv) - : defaultValue(stringify(def)), currentValue(stringify(def)), type(SPIN), minValue(minv), maxValue(maxv) {} - -} +} // namespace Stockfish