X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=345b16dcf9fe9bc8b785ebfbdeab1242e54e693b;hp=0f9c2f8a263b1d751adb284d82e02d1d81e24435;hb=17b71fe51da9d0803c7cfe9fa5df981c4a8fcb8f;hpb=b884351cc70bb500c0b411982b4aded30e89acc1
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 0f9c2f8a..345b16dc 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-2009 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,324 +17,151 @@
along with this program. If not, see
#include
-#include
-#include
+#include
#include
-#include
+#include "evaluate.h"
#include "misc.h"
#include "thread.h"
+#include "tt.h"
#include "ucioption.h"
using std::string;
-////
-//// Local definitions
-////
-
-namespace {
-
- ///
- /// Types
- ///
-
- enum OptionType { SPIN, COMBO, CHECK, STRING, BUTTON };
-
- typedef std::vector ComboValues;
-
- struct Option {
-
- string name, defaultValue, currentValue;
- OptionType type;
- size_t idx;
- int minValue, maxValue;
- ComboValues comboValues;
-
- Option();
- Option(const char* defaultValue, OptionType = STRING);
- Option(bool defaultValue, OptionType = CHECK);
- Option(int defaultValue, int minValue, int maxValue);
-
- bool operator<(const Option& o) const { return this->idx < o.idx; }
- };
-
- 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(10, 1, 100);
- o["Full Depth Moves (non-PV nodes)"] = Option(3, 1, 100);
- o["Threat Depth"] = Option(5, 0, 100);
- 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, THREAD_MAX);
- o["Hash"] = Option(32, 4, 2048);
- o["Clear Hash"] = Option(false, BUTTON);
- o["New Game"] = 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);
- o["UCI_AnalyseMode"] = Option(false);
-
- // Any option should know its name so to be easily printed
- for (Options::iterator it = o.begin(); it != o.end(); ++it)
- it->second.name = it->first;
- }
-
- ///
- /// Variables
- ///
-
- Options options;
-
- // stringify converts a value of type T to a std::string
- template
- string stringify(const T& v) {
-
- std::ostringstream ss;
- ss << v;
- return ss.str();
- }
-
-
- // 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 string& optionName) {
-
- T ret = T();
- if (options.find(optionName) == options.end())
- return ret;
-
- std::istringstream ss(options[optionName].currentValue);
- ss >> ret;
- return ret;
- }
-
- // Specialization for std::string where instruction 'ss >> ret;'
- // would erroneusly tokenize a string with spaces.
-
- template<>
- string get_option_value(const string& optionName) {
-
- if (options.find(optionName) == options.end())
- return string();
-
- return options[optionName].currentValue;
- }
-
-}
+UCI::OptionsMap Options; // Global object
-////
-//// Functions
-////
+namespace UCI {
-/// 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.
+/// '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.set_size(o); }
+void on_clear_hash(const Option&) { TT.clear(); }
-void init_uci_options() {
- load_defaults(options);
+/// Our case insensitive less() function as required by UCI protocol
+bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
- // 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));
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+ return std::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"
- };
-
- // Build up a vector out of the options map and sort it according to idx
- // field, that is the chronological insertion order in options map.
- std::vector vec;
- for (Options::const_iterator it = options.begin(); it != options.end(); ++it)
- vec.push_back(it->second);
-
- std::sort(vec.begin(), vec.end());
-
- for (std::vector ::const_iterator it = vec.begin(); it != vec.end(); ++it)
- {
- std::cout << "\noption name " << it->name
- << " type " << optionTypeName[it->type];
-
- if (it->type == BUTTON)
- continue;
-
- if (it->type == CHECK)
- std::cout << " default " << (it->defaultValue == "1" ? "true" : "false");
- else
- std::cout << " default " << it->defaultValue;
-
- if (it->type == SPIN)
- std::cout << " min " << it->minValue << " max " << it->maxValue;
- else if (it->type == COMBO)
- for (ComboValues::const_iterator itc = it->comboValues.begin();
- itc != it->comboValues.end(); ++itc)
- std::cout << " var " << *itc;
- }
- std::cout << std::endl;
+/// init() 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.
+
+void init(OptionsMap& o) {
+
+ int cpus = std::min(cpu_count(), MAX_THREADS);
+ int msd = cpus < 8 ? 4 : 7;
+
+ o["Use Debug Log"] = Option(false, on_logger);
+ 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["Contempt Factor"] = Option(0, -50, 50);
+ o["Mobility (Middle Game)"] = Option(100, 0, 200, on_eval);
+ o["Mobility (Endgame)"] = Option(100, 0, 200, on_eval);
+ o["Passed Pawns (Middle Game)"] = 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["Min Split Depth"] = Option(msd, 4, 7, on_threads);
+ o["Max Threads per Split Point"] = Option(5, 4, 8, on_threads);
+ o["Threads"] = Option(cpus, 1, MAX_THREADS, on_threads);
+ o["Use Sleeping Threads"] = Option(true);
+ o["Hash"] = Option(32, 4, 8192, 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(200, 0, 30000);
+ o["Emergency Move Time"] = Option(70, 0, 5000);
+ o["Minimum Thinking Time"] = Option(20, 0, 5000);
+ o["Slow Mover"] = Option(100, 10, 1000);
+ o["UCI_Chess960"] = Option(false);
+ o["UCI_AnalyseMode"] = Option(false, on_eval);
+ o["pin_open"] = Option(15, -100, 100, on_eval);
+ o["pin_end"] = Option(25, -100, 100, on_eval);
}
-/// get_option_value_bool() returns the current value of a UCI parameter of
-/// type "check".
+/// 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.
-bool get_option_value_bool(const 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 (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;
+ if (o.type != "button")
+ os << " default " << o.defaultValue;
-/// 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 == "spin")
+ os << " min " << o.min << " max " << o.max;
-int get_option_value_int(const string& optionName) {
-
- 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".
-
-string get_option_value_string(const string& optionName) {
+/// Option c'tors and conversion operators
- return get_option_value(optionName);
-}
+Option::Option(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f)
+{ defaultValue = currentValue = v; }
+Option::Option(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f)
+{ defaultValue = currentValue = (v ? "true" : "false"); }
-/// 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(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f)
+{}
-void set_option_value(const string& name, const string& value) {
+Option::Option(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f)
+{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
- // UCI protocol uses "true" and "false" instead of "1" and "0", so convert
- // value according to standard C++ convention before to store it.
- string v(value);
- if (v == "true")
- v = "1";
- else if (v == "false")
- v = "0";
- if (options.find(name) != options.end())
- options[name].currentValue = v;
- else
- std::cout << "No such option: " << name << std::endl;
+Option::operator int() const {
+ assert(type == "check" || type == "spin");
+ return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
}
-
-/// push_button() is used to tell the engine that a UCI parameter of type
-/// "button" has been selected:
-
-void push_button(const string& buttonName) {
-
- set_option_value(buttonName, "true");
+Option::operator std::string() const {
+ assert(type == "string");
+ return currentValue;
}
-/// 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.
+/// 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 button_was_pressed(const string& buttonName) {
+Option& Option::operator=(const string& v) {
- if (!get_option_value(buttonName))
- return false;
+ assert(!type.empty());
- set_option_value(buttonName, "false");
- return true;
-}
+ 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;
+ if (type != "button")
+ currentValue = v;
-namespace {
-
- // Define constructors of Option class.
-
- Option::Option() {} // To allow insertion in a std::map
-
- Option::Option(const char* def, OptionType t)
- : defaultValue(def), currentValue(def), type(t), idx(options.size()), minValue(0), maxValue(0) {}
-
- Option::Option(bool def, OptionType t)
- : defaultValue(stringify(def)), currentValue(stringify(def)), type(t), idx(options.size()), minValue(0), maxValue(0) {}
-
- Option::Option(int def, int minv, int maxv)
- : defaultValue(stringify(def)), currentValue(stringify(def)), type(SPIN), idx(options.size()), minValue(minv), maxValue(maxv) {}
+ if (on_change)
+ (*on_change)(*this);
+ return *this;
}
+
+} // namespace UCI