X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fucioption.cpp;h=487778e5ad590b007dde1156f9a95eef6c09b559;hb=635be39acf8f1de7686d78fe3fc271c84673d1b8;hp=9f1447e19944c42064998321af595af437292471;hpb=968c3de8e0acd46a8b55225dda1ed607ce24f380;p=stockfish
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 9f1447e1..487778e5 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-2010 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,192 +17,97 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
-#include
-#include
-#include
-#include
+#include
+#include
#include
-#include
#include "misc.h"
#include "thread.h"
#include "ucioption.h"
using std::string;
+using std::cout;
+using std::endl;
-////
-//// 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 Evasion Extension (PV nodes)"] = Option(2, 0, 2);
- o["Single Evasion 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();
- }
+OptionsMap Options; // Global object
- // 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.
+// Our case insensitive less() function as required by UCI protocol
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
- template
- T get_option_value(const string& optionName) {
+ int c1, c2;
+ size_t i = 0;
- T ret = T();
- if (options.find(optionName) == options.end())
- return ret;
+ while (i < s1.size() && i < s2.size())
+ {
+ c1 = tolower(s1[i]);
+ c2 = tolower(s2[i++]);
- std::istringstream ss(options[optionName].currentValue);
- ss >> ret;
- return ret;
+ if (c1 != c2)
+ return c1 < c2;
}
+ return s1.size() < s2.size();
+}
- // 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;
- }
+// stringify() converts a numeric value of type T to a std::string
+template
+static string stringify(const T& v) {
+ std::ostringstream ss;
+ ss << v;
+ return ss.str();
}
-////
-//// 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.
+/// init_uci_options() 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.
void init_uci_options() {
- load_defaults(options);
-
- // Set optimal value for parameter "Minimum Split Depth"
- // according to number of available cores.
- assert(options.find("Threads") != options.end());
- assert(options.find("Minimum Split Depth") != options.end());
-
- Option& thr = options["Threads"];
- Option& msd = options["Minimum Split Depth"];
+ Options["Use Search Log"] = Option(false);
+ Options["Search Log Filename"] = Option("SearchLog.txt");
+ Options["Book File"] = Option("book.bin");
+ Options["Best Book Move"] = Option(false);
+ Options["Mobility (Middle Game)"] = Option(100, 0, 200);
+ Options["Mobility (Endgame)"] = Option(100, 0, 200);
+ Options["Pawn Structure (Middle Game)"] = Option(100, 0, 200);
+ Options["Pawn Structure (Endgame)"] = Option(100, 0, 200);
+ Options["Passed Pawns (Middle Game)"] = Option(100, 0, 200);
+ Options["Passed Pawns (Endgame)"] = Option(100, 0, 200);
+ Options["Space"] = Option(100, 0, 200);
+ Options["Aggressiveness"] = Option(100, 0, 200);
+ Options["Cowardice"] = Option(100, 0, 200);
+ Options["Check Extension (PV nodes)"] = Option(2, 0, 2);
+ Options["Check Extension (non-PV nodes)"] = Option(1, 0, 2);
+ Options["Mate Threat Extension (PV nodes)"] = Option(2, 0, 2);
+ Options["Mate Threat Extension (non-PV nodes)"] = Option(2, 0, 2);
+ Options["Pawn Push to 7th Extension (PV nodes)"] = Option(1, 0, 2);
+ Options["Pawn Push to 7th Extension (non-PV nodes)"] = Option(1, 0, 2);
+ Options["Passed Pawn Extension (PV nodes)"] = Option(1, 0, 2);
+ Options["Passed Pawn Extension (non-PV nodes)"] = Option(0, 0, 2);
+ Options["Pawn Endgame Extension (PV nodes)"] = Option(2, 0, 2);
+ Options["Pawn Endgame Extension (non-PV nodes)"] = Option(2, 0, 2);
+ Options["Minimum Split Depth"] = Option(4, 4, 7);
+ Options["Maximum Number of Threads per Split Point"] = Option(5, 4, 8);
+ Options["Threads"] = Option(1, 1, MAX_THREADS);
+ Options["Use Sleeping Threads"] = Option(true);
+ Options["Hash"] = Option(32, 4, 8192);
+ Options["Clear Hash"] = Option(false, "button");
+ Options["Ponder"] = Option(true);
+ Options["OwnBook"] = Option(true);
+ Options["MultiPV"] = Option(1, 1, 500);
+ Options["Emergency Move Horizon"] = Option(40, 0, 50);
+ Options["Emergency Base Time"] = Option(200, 0, 30000);
+ Options["Emergency Move Time"] = Option(70, 0, 5000);
+ Options["Minimum Thinking Time"] = Option(20, 0, 5000);
+ Options["UCI_Chess960"] = Option(false);
+ Options["UCI_AnalyseMode"] = Option(false);
+
+ // Set some SMP parameters accordingly to the detected CPU count
+ Option& thr = Options["Threads"];
+ Option& msd = Options["Minimum Split Depth"];
thr.defaultValue = thr.currentValue = stringify(cpu_count());
@@ -211,133 +116,65 @@ void init_uci_options() {
}
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in the format defined by the UCI protocol.
+/// options_to_uci() returns a string with all the UCI options in chronological
+/// insertion order (the idx field) and in the format defined by the UCI protocol.
-void print_uci_options() {
+string options_to_uci() {
- static const char optionTypeName[][16] = {
- "spin", "combo", "check", "string", "button"
- };
+ std::stringstream s;
- // 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);
+ for (size_t i = 0; i <= Options.size(); i++)
+ for (OptionsMap::const_iterator it = Options.begin(); it != Options.end(); ++it)
+ if (it->second.idx == i)
+ {
+ const Option& o = it->second;
+ s << "\noption name " << it->first << " type " << o.type;
- std::sort(vec.begin(), vec.end());
+ if (o.type != "button")
+ s << " default " << o.defaultValue;
- 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;
-}
+ if (o.type == "spin")
+ s << " min " << o.minValue << " max " << o.maxValue;
-
-/// get_option_value_bool() returns the current value of a UCI parameter of
-/// type "check".
-
-bool get_option_value_bool(const string& optionName) {
-
- return get_option_value(optionName);
+ break;
+ }
+ return s.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.
+/// Option class c'tors
-int get_option_value_int(const string& optionName) {
+Option::Option(const char* def) : type("string"), idx(Options.size()), minValue(0), maxValue(0)
+{ defaultValue = currentValue = def; }
- return get_option_value(optionName);
-}
+Option::Option(bool def, string t) : type(t), idx(Options.size()), minValue(0), maxValue(0)
+{ defaultValue = currentValue = (def ? "true" : "false"); }
+Option::Option(int def, int minv, int maxv) : type("spin"), idx(Options.size()), minValue(minv), maxValue(maxv)
+{ defaultValue = currentValue = stringify(def); }
-/// 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) {
+/// 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.
- return get_option_value(optionName);
-}
+void Option::set_value(const string& value) {
+ assert(!type.empty());
-/// 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.
+ if (value.empty())
+ return;
-void set_option_value(const string& name, const string& value) {
+ if ( (type == "check" || type == "button")
+ != (value == "true" || value == "false"))
+ return;
- // 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;
-}
-
-
-/// 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");
-}
-
-
-/// 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 string& buttonName) {
-
- if (!get_option_value(buttonName))
- return false;
-
- set_option_value(buttonName, "false");
- return true;
-}
-
-
-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 (type == "spin")
+ {
+ int v = atoi(value.c_str());
+ if (v < minValue || v > maxValue)
+ return;
+ }
+ currentValue = value;
}