X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=fe98457546ec1e39df58a38b066d77992d97b04a;hp=442ca924e10761a030213f8a32533ad943509963;hb=8008f784150d040497ac8bd5a5153d90ea0dbde6;hpb=f1d982e2c07372627394b83cf24f48e77a34145b diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 442ca924..fe984575 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-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,13 +33,7 @@ #include "thread.h" #include "ucioption.h" - -//// -//// Variables -//// - -bool Chess960; - +using std::string; //// //// Local definitions @@ -53,11 +47,11 @@ namespace { enum OptionType { SPIN, COMBO, CHECK, STRING, BUTTON }; - typedef std::vector ComboValues; + typedef std::vector ComboValues; struct Option { - std::string name, defaultValue, currentValue; + string name, defaultValue, currentValue; OptionType type; size_t idx; int minValue, maxValue; @@ -71,7 +65,7 @@ namespace { bool operator<(const Option& o) const { return this->idx < o.idx; } }; - typedef std::map Options; + typedef std::map Options; /// /// Constants @@ -112,8 +106,8 @@ namespace { 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["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); @@ -122,25 +116,20 @@ namespace { 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["Futility Pruning (Main Search)"] = Option(true); - o["Futility Pruning (Quiescence Search)"] = Option(true); - 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["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) @@ -155,7 +144,7 @@ namespace { // stringify converts a value of type T to a std::string template - std::string stringify(const T& v) { + string stringify(const T& v) { std::ostringstream ss; ss << v; @@ -168,7 +157,7 @@ namespace { // type changes a template seems a proper solution. template - T get_option_value(const std::string& optionName) { + T get_option_value(const string& optionName) { T ret = T(); if (options.find(optionName) == options.end()) @@ -179,6 +168,18 @@ namespace { 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; + } + } //// @@ -193,24 +194,18 @@ 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. + // 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()); - options["Threads"].defaultValue = stringify(Min(cpu_count(), 7)); - options["Threads"].currentValue = stringify(Min(cpu_count(), 7)); + Option& thr = options["Threads"]; + Option& msd = options["Minimum Split Depth"]; - // 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"; - } + thr.defaultValue = thr.currentValue = stringify(cpu_count()); + + if (cpu_count() >= 8) + msd.defaultValue = msd.currentValue = stringify(7); } @@ -245,9 +240,7 @@ void print_uci_options() { std::cout << " default " << it->defaultValue; if (it->type == SPIN) - std::cout << " min " << it->minValue - << " max " << it->maxValue; - + 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) @@ -260,7 +253,7 @@ void print_uci_options() { /// get_option_value_bool() returns the current value of a UCI parameter of /// type "check". -bool get_option_value_bool(const std::string& optionName) { +bool get_option_value_bool(const string& optionName) { return get_option_value(optionName); } @@ -271,7 +264,7 @@ bool get_option_value_bool(const std::string& optionName) { /// 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) { +int get_option_value_int(const string& optionName) { return get_option_value(optionName); } @@ -280,9 +273,9 @@ int get_option_value_int(const std::string& optionName) { /// 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) { +string get_option_value_string(const string& optionName) { - return get_option_value(optionName); + return get_option_value(optionName); } @@ -290,28 +283,45 @@ const std::string get_option_value_string(const std::string& optionName) { /// 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) { +void set_option_value(const string& name, const string& value) { // UCI protocol uses "true" and "false" instead of "1" and "0", so convert - // newValue according to standard C++ convention before to store it. - std::string v(newValue); + // 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(optionName) != options.end()) - options[optionName].currentValue = v; - else - std::cout << "No such option: " << optionName << std::endl; + if (options.find(name) == options.end()) + { + std::cout << "No such option: " << name << std::endl; + return; + } + + // 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& opt = options[name]; + + if (opt.type == CHECK && v != "0" && v != "1") + return; + + else if (opt.type == SPIN) + { + int val = atoi(v.c_str()); + if (val < opt.minValue || val > opt.maxValue) + return; + } + + opt.currentValue = v; } /// 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) { +void push_button(const string& buttonName) { set_option_value(buttonName, "true"); } @@ -321,10 +331,10 @@ void push_button(const std::string& buttonName) { /// 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) { +bool button_was_pressed(const string& buttonName) { if (!get_option_value(buttonName)) - return false; + return false; set_option_value(buttonName, "false"); return true;