X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=8162bc4294fa2870ad411b9814440f84b847cf24;hp=9e992be55c26e7fd50462fb4ac5748393d37862e;hb=aa392c366e6b52fa51b4be7965347d867a7f9804;hpb=f0701e2b0f4283ba558e7d8cab8e41cf11a19cdd diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 9e992be5..8162bc42 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -1,7 +1,7 @@ /* 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) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad 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 +17,111 @@ along with this program. If not, see . */ - -//// -//// Includes -//// - -#include -#include -#include +#include #include -#include #include "misc.h" #include "thread.h" #include "ucioption.h" +using std::string; -//// -//// 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; - - // stringify converts a value of type T to a std::string - template - std::string stringify(const T& v) { - - std::ostringstream ss; - ss << v; - return ss.str(); - } - - // 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"; - } - - // 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) { - - T ret = T(); - if (options.find(optionName) == options.end()) - return ret; - - std::istringstream ss(options[optionName].currentValue); - ss >> ret; - return ret; - } - - // 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. - - template<> - bool get_option_value(const std::string& optionName) { - - if (options.find(optionName) == options.end()) - return false; - - return options[optionName].currentValue == "true"; - } -} - -//// -//// 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); +OptionsMap Options; // Global object - // 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)); +/// Our case insensitive less() function as required by UCI protocol +static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); } - // 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"; - } +bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { + return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less); } -/// 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::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; - } +/// OptionsMap c'tor 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() { + + int cpus = std::min(cpu_count(), MAX_THREADS); + int msd = cpus < 8 ? 4 : 7; + OptionsMap& o = *this; + + o["Use Search Log"] = UCIOption(false); + o["Search Log Filename"] = UCIOption("SearchLog.txt"); + o["Book File"] = UCIOption("book.bin"); + o["Best Book Move"] = UCIOption(false); + o["Mobility (Middle Game)"] = UCIOption(100, 0, 200); + o["Mobility (Endgame)"] = UCIOption(100, 0, 200); + o["Passed Pawns (Middle Game)"] = UCIOption(100, 0, 200); + o["Passed Pawns (Endgame)"] = UCIOption(100, 0, 200); + o["Space"] = UCIOption(100, 0, 200); + o["Aggressiveness"] = UCIOption(100, 0, 200); + o["Cowardice"] = UCIOption(100, 0, 200); + o["Min Split Depth"] = UCIOption(msd, 4, 7); + o["Max Threads per Split Point"] = UCIOption(5, 4, 8); + o["Threads"] = UCIOption(cpus, 1, MAX_THREADS); + o["Use Sleeping Threads"] = UCIOption(true); + o["Hash"] = UCIOption(32, 4, 8192); + o["Clear Hash"] = UCIOption(false, "button"); + o["Ponder"] = UCIOption(true); + o["OwnBook"] = UCIOption(true); + o["MultiPV"] = UCIOption(1, 1, 500); + o["Skill Level"] = UCIOption(20, 0, 20); + o["Emergency Move Horizon"] = UCIOption(30, 0, 50); + o["Emergency Base Time"] = UCIOption(200, 0, 30000); + o["Emergency Move Time"] = UCIOption(70, 0, 5000); + o["Minimum Thinking Time"] = UCIOption(20, 0, 5000); + o["UCI_Chess960"] = UCIOption(false); + o["UCI_AnalyseMode"] = UCIOption(false); } -/// 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); -} +/// operator<<() is used to output all the UCI options in chronological insertion +/// order (the idx field) and in the format defined by the UCI protocol. +std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { + for (size_t idx = 0; idx < om.size(); idx++) + for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it) + if (it->second.idx == idx) + { + const UCIOption& o = it->second; + os << "\noption name " << it->first << " type " << o.type; -/// 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. + if (o.type != "button") + os << " default " << o.defaultValue; -int get_option_value_int(const std::string& optionName) { + if (o.type == "spin") + os << " min " << o.min << " max " << o.max; - return get_option_value(optionName); + break; + } + return os; } -/// 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); -} - - -/// 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 set_option_value(const std::string& optionName, - const std::string& newValue) { - - if (options.find(optionName) != options.end()) - options[optionName].currentValue = newValue; - else - std::cout << "No such option: " << optionName << std::endl; -} - - -/// 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"); -} - - -/// 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. - -bool button_was_pressed(const std::string& buttonName) { - - if (!get_option_value(buttonName)) - return false; - - set_option_value(buttonName, "false"); - return true; -} +/// UCIOption class c'tors +UCIOption::UCIOption(const char* v) : type("string"), min(0), max(0), idx(Options.size()) +{ defaultValue = currentValue = v; } -namespace { +UCIOption::UCIOption(bool v, string t) : type(t), min(0), max(0), idx(Options.size()) +{ defaultValue = currentValue = (v ? "true" : "false"); } - // Define constructors of Option class. +UCIOption::UCIOption(int v, int minv, int maxv) : type("spin"), min(minv), max(maxv), idx(Options.size()) +{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); } - 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) {} +/// UCIOption::operator=() updates currentValue. Normally 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. - Option::Option(bool def, OptionType t) - : defaultValue(stringify(def)), currentValue(stringify(def)), type(t), minValue(0), maxValue(0) {} +void UCIOption::operator=(const string& v) { - Option::Option(int def, int minv, int maxv) - : defaultValue(stringify(def)), currentValue(stringify(def)), type(SPIN), minValue(minv), maxValue(maxv) {} + assert(!type.empty()); + if ( !v.empty() + && (type == "check" || type == "button") == (v == "true" || v == "false") + && (type != "spin" || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max))) + currentValue = v; }