X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fucioption.cpp;h=a8b34c7021c27e05d4545bd22e5e3fb648320e18;hb=c9d7e99de682516c560009b550c41da9ae2008b8;hp=cc19e23610be28ed6879ff3d5ea095eb1dac031e;hpb=e5068c4734a9a8ba6f8cdb03ec787b76755d57b2;p=stockfish
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index cc19e236..a8b34c70 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -1,13 +1,14 @@
/*
- 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-2010 Marco Costalba, Joona Kiiski, 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 +17,156 @@
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;
+using std::cout;
+using std::endl;
-////
-//// Variables
-////
-
-bool Chess960 = false;
-
+OptionsMap Options; // Global object
-////
-//// Local definitions
-////
-namespace {
+// Our case insensitive less() function as required by UCI protocol
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
- ///
- /// Types
- ///
+ int c1, c2;
+ size_t i = 0;
- enum OptionType { SPIN, COMBO, CHECK, STRING, BUTTON, OPTION_TYPE_NONE };
-
- typedef std::vector ComboValues;
-
- struct Option
+ while (i < s1.size() && i < s2.size())
{
- 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
-////
-
-/// 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.
- Options::iterator it = option_from_name("Threads");
-
- assert(it != options.end());
-
- it->defaultValue = Min(cpu_count(), 7);
- it->currentValue = Min(cpu_count(), 7);
-
- // 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;
- }
-}
-
-
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in the format defined by the UCI protocol.
-
-void print_uci_options() {
+ c1 = tolower(s1[i]);
+ c2 = tolower(s2[i++]);
- 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;
+ if (c1 != c2)
+ return c1 < c2;
}
+ return s1.size() < s2.size();
}
-/// get_option_value_bool() returns the current value of a UCI parameter of
-/// type "check".
-bool get_option_value_bool(const std::string& optionName) {
+// stringify() converts a numeric value of type T to a std::string
+template
+static string stringify(const T& v) {
- return get_option_value(optionName);
+ std::ostringstream ss;
+ ss << v;
+ return ss.str();
}
-/// 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);
+/// 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);
}
-/// 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".
+/// 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.
-const std::string get_option_value_string(const std::string& optionName) {
-
- return get_option_value(optionName);
-}
+string OptionsMap::print_all() const {
+ std::stringstream s;
-/// button_was_pressed() tests whether a UCI parameter of type "button" has
-/// been selected since the last time the function was called.
+ 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;
-bool button_was_pressed(const std::string& buttonName) {
+ if (o.type != "button")
+ s << " default " << o.defaultValue;
- if (get_option_value(buttonName))
- {
- set_option_value(buttonName, "false");
- return true;
- }
+ if (o.type == "spin")
+ s << " min " << o.minValue << " max " << o.maxValue;
- return false;
+ break;
+ }
+ return s.str();
}
-/// 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 class c'tors
-void set_option_value(const std::string& optionName,
- const std::string& newValue) {
+Option::Option(const char* def) : type("string"), minValue(0), maxValue(0), idx(Options.size())
+{ defaultValue = currentValue = def; }
- Options::iterator it = option_from_name(optionName);
-
- if (it != options.end())
- it->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");
-}
+Option::Option(bool def, string t) : type(t), minValue(0), maxValue(0), idx(Options.size())
+{ defaultValue = currentValue = (def ? "true" : "false"); }
+Option::Option(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size())
+{ defaultValue = currentValue = stringify(def); }
-namespace {
- // methods and c'tors of Option class.
+/// set_value() updates currentValue of the Option object. 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.
- template
- std::string Option::stringify(const T& v)
- {
- std::ostringstream ss;
- ss << v;
+void Option::set_value(const string& v) {
- return ss.str();
- }
+ assert(!type.empty());
- template<>
- std::string Option::stringify(const bool& v)
- {
- return v ? "true" : "false";
- }
+ if (v.empty())
+ return;
- Option::Option(const char* nm, const char* def, OptionType t)
- : name(nm), defaultValue(def), currentValue(def), type(t), minValue(0), maxValue(0) {}
+ if ((type == "check" || type == "button") != (v == "true" || v == "false"))
+ return;
- 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) {}
-
-
- // 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.
-
- template
- T get_option_value(const std::string& optionName) {
-
- T ret;
-
- Options::iterator it = option_from_name(optionName);
-
- if (it != options.end())
- {
- std::istringstream ss(it->currentValue);
- ss >> ret;
- }
- return ret;
- }
-
-
- // option_from_name returns an iterator to the option
- // with name optionName.
-
- Options::iterator option_from_name(const std::string& optionName) {
-
- for (Options::iterator it = options.begin(); it != options.end(); ++it)
- if (it->name == optionName)
- return it;
-
- return options.end();
- }
+ if (type == "spin")
+ {
+ int val = atoi(v.c_str());
+ if (val < minValue || val > maxValue)
+ return;
+ }
+ currentValue = v;
}