Rewrite options handling in an object oriented fashion
Big rewrite and about 100 lines removed. No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>sf_2.3.1_base
Marco Costalba
parent
fb50e16cdd
commit
bacb645939
|
|
@ -89,11 +89,11 @@ void benchmark(const string& commandLine) {
|
|||
cerr << "The number of threads must be between 1 and " << MAX_THREADS << endl;
|
||||
Application::exit_with_failure();
|
||||
}
|
||||
set_option_value("Hash", ttSize);
|
||||
set_option_value("Threads", threads);
|
||||
set_option_value("OwnBook", "false");
|
||||
set_option_value("Use Search Log", "true");
|
||||
set_option_value("Search Log Filename", "bench.txt");
|
||||
Options["Hash"].set_value(ttSize);
|
||||
Options["Threads"].set_value(threads);
|
||||
Options["OwnBook"].set_value("false");
|
||||
Options["Use Search Log"].set_value("true");
|
||||
Options["Search Log Filename"].set_value("bench.txt");
|
||||
|
||||
csVal >> val;
|
||||
csVal >> fileName;
|
||||
|
|
|
|||
|
|
@ -423,7 +423,7 @@ void read_weights(Color us) {
|
|||
|
||||
// If running in analysis mode, make sure we use symmetrical king safety. We do this
|
||||
// by replacing both Weights[kingDangerUs] and Weights[kingDangerThem] by their average.
|
||||
if (get_option_value_bool("UCI_AnalyseMode"))
|
||||
if (Options["UCI_AnalyseMode"].value<bool>())
|
||||
Weights[kingDangerUs] = Weights[kingDangerThem] = (Weights[kingDangerUs] + Weights[kingDangerThem]) / 2;
|
||||
|
||||
init_safety();
|
||||
|
|
@ -920,8 +920,8 @@ namespace {
|
|||
Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) {
|
||||
|
||||
// Scale option value from 100 to 256
|
||||
int mg = get_option_value_int(mgOpt) * 256 / 100;
|
||||
int eg = get_option_value_int(egOpt) * 256 / 100;
|
||||
int mg = Options[mgOpt].value<int>() * 256 / 100;
|
||||
int eg = Options[egOpt].value<int>() * 256 / 100;
|
||||
|
||||
return apply_weight(make_score(mg, eg), internalWeight);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,18 +21,6 @@
|
|||
#if !defined(POSITION_H_INCLUDED)
|
||||
#define POSITION_H_INCLUDED
|
||||
|
||||
// Disable some silly and noisy warning from MSVC compiler
|
||||
#if defined(_MSC_VER)
|
||||
|
||||
// Forcing value to bool 'true' or 'false' (performance warning)
|
||||
#pragma warning(disable: 4800)
|
||||
|
||||
// Conditional expression is constant
|
||||
#pragma warning(disable: 4127)
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
////
|
||||
//// Includes
|
||||
////
|
||||
|
|
|
|||
|
|
@ -407,12 +407,12 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[
|
|||
UseTimeManagement = !ExactMaxTime && !MaxDepth && !MaxNodes && !InfiniteSearch;
|
||||
|
||||
// Look for a book move, only during games, not tests
|
||||
if (UseTimeManagement && get_option_value_bool("OwnBook"))
|
||||
if (UseTimeManagement && Options["OwnBook"].value<bool>())
|
||||
{
|
||||
if (get_option_value_string("Book File") != OpeningBook.file_name())
|
||||
OpeningBook.open(get_option_value_string("Book File"));
|
||||
if (Options["Book File"].value<std::string>() != OpeningBook.file_name())
|
||||
OpeningBook.open(Options["Book File"].value<std::string>());
|
||||
|
||||
Move bookMove = OpeningBook.get_move(pos, get_option_value_bool("Best Book Move"));
|
||||
Move bookMove = OpeningBook.get_move(pos, Options["Best Book Move"].value<bool>());
|
||||
if (bookMove != MOVE_NONE)
|
||||
{
|
||||
if (PonderSearch)
|
||||
|
|
@ -424,38 +424,38 @@ bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[
|
|||
}
|
||||
|
||||
// Read UCI option values
|
||||
TT.set_size(get_option_value_int("Hash"));
|
||||
if (get_option_value_bool("Clear Hash"))
|
||||
TT.set_size(Options["Hash"].value<int>());
|
||||
if (Options["Clear Hash"].value<bool>())
|
||||
{
|
||||
set_option_value("Clear Hash", "false");
|
||||
Options["Clear Hash"].set_value("false");
|
||||
TT.clear();
|
||||
}
|
||||
|
||||
CheckExtension[1] = Depth(get_option_value_int("Check Extension (PV nodes)"));
|
||||
CheckExtension[0] = Depth(get_option_value_int("Check Extension (non-PV nodes)"));
|
||||
SingleEvasionExtension[1] = Depth(get_option_value_int("Single Evasion Extension (PV nodes)"));
|
||||
SingleEvasionExtension[0] = Depth(get_option_value_int("Single Evasion Extension (non-PV nodes)"));
|
||||
PawnPushTo7thExtension[1] = Depth(get_option_value_int("Pawn Push to 7th Extension (PV nodes)"));
|
||||
PawnPushTo7thExtension[0] = Depth(get_option_value_int("Pawn Push to 7th Extension (non-PV nodes)"));
|
||||
PassedPawnExtension[1] = Depth(get_option_value_int("Passed Pawn Extension (PV nodes)"));
|
||||
PassedPawnExtension[0] = Depth(get_option_value_int("Passed Pawn Extension (non-PV nodes)"));
|
||||
PawnEndgameExtension[1] = Depth(get_option_value_int("Pawn Endgame Extension (PV nodes)"));
|
||||
PawnEndgameExtension[0] = Depth(get_option_value_int("Pawn Endgame Extension (non-PV nodes)"));
|
||||
MateThreatExtension[1] = Depth(get_option_value_int("Mate Threat Extension (PV nodes)"));
|
||||
MateThreatExtension[0] = Depth(get_option_value_int("Mate Threat Extension (non-PV nodes)"));
|
||||
CheckExtension[1] = Options["Check Extension (PV nodes)"].value<Depth>();
|
||||
CheckExtension[0] = Options["Check Extension (non-PV nodes)"].value<Depth>();
|
||||
SingleEvasionExtension[1] = Options["Single Evasion Extension (PV nodes)"].value<Depth>();
|
||||
SingleEvasionExtension[0] = Options["Single Evasion Extension (non-PV nodes)"].value<Depth>();
|
||||
PawnPushTo7thExtension[1] = Options["Pawn Push to 7th Extension (PV nodes)"].value<Depth>();
|
||||
PawnPushTo7thExtension[0] = Options["Pawn Push to 7th Extension (non-PV nodes)"].value<Depth>();
|
||||
PassedPawnExtension[1] = Options["Passed Pawn Extension (PV nodes)"].value<Depth>();
|
||||
PassedPawnExtension[0] = Options["Passed Pawn Extension (non-PV nodes)"].value<Depth>();
|
||||
PawnEndgameExtension[1] = Options["Pawn Endgame Extension (PV nodes)"].value<Depth>();
|
||||
PawnEndgameExtension[0] = Options["Pawn Endgame Extension (non-PV nodes)"].value<Depth>();
|
||||
MateThreatExtension[1] = Options["Mate Threat Extension (PV nodes)"].value<Depth>();
|
||||
MateThreatExtension[0] = Options["Mate Threat Extension (non-PV nodes)"].value<Depth>();
|
||||
|
||||
MinimumSplitDepth = get_option_value_int("Minimum Split Depth") * ONE_PLY;
|
||||
MaxThreadsPerSplitPoint = get_option_value_int("Maximum Number of Threads per Split Point");
|
||||
MultiPV = get_option_value_int("MultiPV");
|
||||
UseLogFile = get_option_value_bool("Use Search Log");
|
||||
MinimumSplitDepth = Options["Minimum Split Depth"].value<int>() * ONE_PLY;
|
||||
MaxThreadsPerSplitPoint = Options["Maximum Number of Threads per Split Point"].value<int>();
|
||||
MultiPV = Options["MultiPV"].value<int>();
|
||||
UseLogFile = Options["Use Search Log"].value<bool>();
|
||||
|
||||
if (UseLogFile)
|
||||
LogFile.open(get_option_value_string("Search Log Filename").c_str(), std::ios::out | std::ios::app);
|
||||
LogFile.open(Options["Search Log Filename"].value<std::string>().c_str(), std::ios::out | std::ios::app);
|
||||
|
||||
read_weights(pos.side_to_move());
|
||||
|
||||
// Set the number of active threads
|
||||
int newActiveThreads = get_option_value_int("Threads");
|
||||
int newActiveThreads = Options["Threads"].value<int>();
|
||||
if (newActiveThreads != ThreadsMgr.active_threads())
|
||||
{
|
||||
ThreadsMgr.set_active_threads(newActiveThreads);
|
||||
|
|
|
|||
|
|
@ -114,10 +114,10 @@ void TimeManager::init(int myTime, int myInc, int movesToGo, int currentPly)
|
|||
int hypMTG, hypMyTime, t1, t2;
|
||||
|
||||
// Read uci parameters
|
||||
int emergencyMoveHorizon = get_option_value_int("Emergency Move Horizon");
|
||||
int emergencyBaseTime = get_option_value_int("Emergency Base Time");
|
||||
int emergencyMoveTime = get_option_value_int("Emergency Move Time");
|
||||
int minThinkingTime = get_option_value_int("Minimum Thinking Time");
|
||||
int emergencyMoveHorizon = Options["Emergency Move Horizon"].value<int>();
|
||||
int emergencyBaseTime = Options["Emergency Base Time"].value<int>();
|
||||
int emergencyMoveTime = Options["Emergency Move Time"].value<int>();
|
||||
int minThinkingTime = Options["Minimum Thinking Time"].value<int>();
|
||||
|
||||
// Initialize to maximum values but unstablePVExtraTime that is reset
|
||||
unstablePVExtraTime = 0;
|
||||
|
|
@ -137,7 +137,7 @@ void TimeManager::init(int myTime, int myInc, int movesToGo, int currentPly)
|
|||
maximumSearchTime = Min(maximumSearchTime, t2);
|
||||
}
|
||||
|
||||
if (get_option_value_bool("Ponder"))
|
||||
if (Options["Ponder"].value<bool>())
|
||||
optimumSearchTime += optimumSearchTime / 4;
|
||||
|
||||
// Make sure that maxSearchTime is not over absoluteMaxSearchTime
|
||||
|
|
|
|||
|
|
@ -27,6 +27,10 @@
|
|||
|
||||
#else
|
||||
|
||||
// Disable some silly and noisy warning from MSVC compiler
|
||||
#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
|
||||
#pragma warning(disable: 4127) // Conditional expression is constant
|
||||
|
||||
typedef __int8 int8_t;
|
||||
typedef unsigned __int8 uint8_t;
|
||||
typedef __int16 int16;
|
||||
|
|
|
|||
12
src/uci.cpp
12
src/uci.cpp
|
|
@ -122,7 +122,7 @@ namespace {
|
|||
}
|
||||
else if (token == "ucinewgame")
|
||||
{
|
||||
set_option_value("New Game", "true");
|
||||
Options["New Game"].set_value("true");
|
||||
pos.from_fen(StartPositionFEN);
|
||||
}
|
||||
else if (token == "isready")
|
||||
|
|
@ -233,16 +233,22 @@ namespace {
|
|||
while (uip >> token && token != "value")
|
||||
name += (" " + token);
|
||||
|
||||
if (Options.find(name) == Options.end())
|
||||
{
|
||||
cout << "No such option: " << name << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
if (token != "value" || !(uip >> value))
|
||||
{
|
||||
set_option_value(name, "true");
|
||||
Options[name].set_value("true");
|
||||
return;
|
||||
}
|
||||
|
||||
while (uip >> token)
|
||||
value += (" " + token);
|
||||
|
||||
set_option_value(name, value);
|
||||
Options[name].set_value(value);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -17,17 +17,8 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
////
|
||||
//// Includes
|
||||
////
|
||||
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
|
||||
#include "misc.h"
|
||||
#include "thread.h"
|
||||
|
|
@ -37,150 +28,68 @@ using std::string;
|
|||
using std::cout;
|
||||
using std::endl;
|
||||
|
||||
////
|
||||
//// Local definitions
|
||||
////
|
||||
OptionsMap Options;
|
||||
|
||||
namespace {
|
||||
|
||||
enum OptionType { SPIN, COMBO, CHECK, STRING, BUTTON };
|
||||
|
||||
typedef std::vector<string> StrVector;
|
||||
|
||||
struct Option {
|
||||
|
||||
string name, defaultValue, currentValue;
|
||||
OptionType type;
|
||||
size_t idx;
|
||||
int minValue, maxValue;
|
||||
StrVector 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 idx < o.idx; }
|
||||
};
|
||||
|
||||
typedef std::vector<Option> OptionsVector;
|
||||
typedef std::map<string, Option> Options;
|
||||
|
||||
Options options;
|
||||
|
||||
// stringify() converts a value of type T to a std::string
|
||||
template<typename T>
|
||||
string stringify(const T& v) {
|
||||
|
||||
std::ostringstream ss;
|
||||
ss << v;
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
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) {}
|
||||
|
||||
// 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["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["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(2, 0, 2);
|
||||
o["Mate Threat Extension (non-PV nodes)"] = Option(2, 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["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["Hash"] = Option(32, 4, 8192);
|
||||
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["Emergency Move Horizon"] = Option(40, 0, 50);
|
||||
o["Emergency Base Time"] = Option(200, 0, 60000);
|
||||
o["Emergency Move Time"] = Option(70, 0, 5000);
|
||||
o["Minimum Thinking Time"] = Option(20, 0, 5000);
|
||||
o["UCI_Chess960"] = Option(false); // Just a dummy but needed by GUIs
|
||||
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;
|
||||
}
|
||||
|
||||
// get_option_value() implements the various get_option_value_<type>
|
||||
// functions defined later.
|
||||
|
||||
template<typename T>
|
||||
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<string>(const string& optionName) {
|
||||
|
||||
if (options.find(optionName) == options.end())
|
||||
return string();
|
||||
|
||||
return options[optionName].currentValue;
|
||||
}
|
||||
// stringify() converts a value of type T to a std::string
|
||||
template<typename T>
|
||||
static string stringify(const T& v) {
|
||||
|
||||
std::ostringstream ss;
|
||||
ss << v;
|
||||
return ss.str();
|
||||
}
|
||||
|
||||
|
||||
/// init_uci_options() initializes the UCI options. Currently, the only thing
|
||||
/// this function does is to initialize the default value of "Threads" and
|
||||
/// "Minimum Split Depth" parameters according to the number of 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);
|
||||
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["Single Evasion Extension (PV nodes)"] = Option(2, 0, 2);
|
||||
Options["Single Evasion Extension (non-PV nodes)"] = Option(2, 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["Hash"] = Option(32, 4, 8192);
|
||||
Options["Clear Hash"] = Option(false, "button");
|
||||
Options["New Game"] = 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, 60000);
|
||||
Options["Emergency Move Time"] = Option(70, 0, 5000);
|
||||
Options["Minimum Thinking Time"] = Option(20, 0, 5000);
|
||||
Options["UCI_Chess960"] = Option(false); // Just a dummy but needed by GUIs
|
||||
Options["UCI_AnalyseMode"] = Option(false);
|
||||
|
||||
assert(options.find("Threads") != options.end());
|
||||
assert(options.find("Minimum Split Depth") != options.end());
|
||||
|
||||
Option& thr = options["Threads"];
|
||||
Option& msd = options["Minimum Split Depth"];
|
||||
// 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());
|
||||
|
||||
|
|
@ -190,85 +99,55 @@ void init_uci_options() {
|
|||
|
||||
|
||||
/// print_uci_options() prints all the UCI options to the standard output,
|
||||
/// in the format defined by the UCI protocol.
|
||||
/// in chronological insertion order (the idx field) and in the format
|
||||
/// defined by the UCI protocol.
|
||||
|
||||
void print_uci_options() {
|
||||
|
||||
const char OptTypeName[][16] = {
|
||||
"spin", "combo", "check", "string", "button"
|
||||
};
|
||||
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;
|
||||
cout << "\noption name " << it->first << " type " << o.type;
|
||||
|
||||
// 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.
|
||||
OptionsVector vec;
|
||||
for (Options::const_iterator it = options.begin(); it != options.end(); ++it)
|
||||
vec.push_back(it->second);
|
||||
if (o.type == "check")
|
||||
cout << " default " << (o.defaultValue == "1" ? "true" : "false");
|
||||
else if (o.type == "string")
|
||||
cout << " default " << o.defaultValue;
|
||||
else if (o.type == "spin")
|
||||
{
|
||||
cout << " default " << o.defaultValue
|
||||
<< " min " << o.minValue << " max " << o.maxValue;
|
||||
}
|
||||
else if (o.type != "button")
|
||||
assert(false);
|
||||
|
||||
std::sort(vec.begin(), vec.end());
|
||||
|
||||
for (OptionsVector::const_iterator it = vec.begin(); it != vec.end(); ++it)
|
||||
{
|
||||
cout << "\noption name " << it->name << " type " << OptTypeName[it->type];
|
||||
|
||||
if (it->type == BUTTON)
|
||||
continue;
|
||||
|
||||
if (it->type == CHECK)
|
||||
cout << " default " << (it->defaultValue == "1" ? "true" : "false");
|
||||
else
|
||||
cout << " default " << it->defaultValue;
|
||||
|
||||
if (it->type == SPIN)
|
||||
cout << " min " << it->minValue << " max " << it->maxValue;
|
||||
else if (it->type == COMBO)
|
||||
{
|
||||
StrVector::const_iterator itc;
|
||||
for (itc = it->comboValues.begin(); itc != it->comboValues.end(); ++itc)
|
||||
cout << " var " << *itc;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
cout << endl;
|
||||
}
|
||||
|
||||
|
||||
/// get_option_value_bool() returns the current value of a UCI parameter of
|
||||
/// type "check".
|
||||
// Option class c'tors
|
||||
|
||||
bool get_option_value_bool(const string& optionName) {
|
||||
Option::Option(): type("UNDEFINED") {}
|
||||
|
||||
return get_option_value<bool>(optionName);
|
||||
}
|
||||
Option::Option(const char* def, string t) : type(t), idx(Options.size()), minValue(0), maxValue(0)
|
||||
{ defaultValue = currentValue = def; }
|
||||
|
||||
Option::Option(bool def, string t) : type(t), idx(Options.size()), minValue(0), maxValue(0)
|
||||
{ defaultValue = currentValue = (def ? "1" : "0"); }
|
||||
|
||||
Option::Option(int def, int minv, int maxv) : type("spin"), idx(Options.size()), minValue(minv), maxValue(maxv)
|
||||
{ defaultValue = currentValue = stringify(def); }
|
||||
|
||||
|
||||
/// 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.
|
||||
// set_value() updates currentValue of the Option object to the passed value
|
||||
|
||||
int get_option_value_int(const string& optionName) {
|
||||
void Option::set_value(const string& value) {
|
||||
|
||||
return get_option_value<int>(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".
|
||||
|
||||
string get_option_value_string(const string& optionName) {
|
||||
|
||||
return get_option_value<string>(optionName);
|
||||
}
|
||||
|
||||
|
||||
/// set_option_value() inserts a new value for a UCI parameter
|
||||
|
||||
void set_option_value(const string& name, const string& value) {
|
||||
|
||||
if (options.find(name) == options.end())
|
||||
{
|
||||
cout << "No such option: " << name << endl;
|
||||
return;
|
||||
}
|
||||
assert(type != "UNDEFINED");
|
||||
|
||||
// UCI protocol uses "true" and "false" instead of "1" and "0", so convert
|
||||
// value according to standard C++ convention before to store it.
|
||||
|
|
@ -281,16 +160,14 @@ void set_option_value(const string& name, const string& value) {
|
|||
// 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")
|
||||
if (type == "check" && v != "0" && v != "1")
|
||||
return;
|
||||
|
||||
if (opt.type == SPIN)
|
||||
if (type == "spin")
|
||||
{
|
||||
int val = atoi(v.c_str());
|
||||
if (val < opt.minValue || val > opt.maxValue)
|
||||
if (val < minValue || val > maxValue)
|
||||
return;
|
||||
}
|
||||
opt.currentValue = v;
|
||||
currentValue = v;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,25 +17,51 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#if !defined(UCIOPTION_H_INCLUDED)
|
||||
#define UCIOPTION_H_INCLUDED
|
||||
|
||||
////
|
||||
//// Includes
|
||||
////
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdlib>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
////
|
||||
//// Prototypes
|
||||
////
|
||||
class Option {
|
||||
public:
|
||||
Option(); // To allow insertion in a std::map
|
||||
Option(const char* defaultValue, std::string type = "string");
|
||||
Option(bool defaultValue, std::string type = "check");
|
||||
Option(int defaultValue, int minValue, int maxValue);
|
||||
|
||||
void set_value(const std::string& value);
|
||||
template<typename T> T value() const;
|
||||
|
||||
private:
|
||||
friend void init_uci_options();
|
||||
friend void print_uci_options();
|
||||
|
||||
std::string defaultValue, currentValue, type;
|
||||
size_t idx;
|
||||
int minValue, maxValue;
|
||||
};
|
||||
|
||||
template<typename T>
|
||||
inline T Option::value() const {
|
||||
|
||||
assert(type != "UNDEFINED");
|
||||
return T(atoi(currentValue.c_str()));
|
||||
}
|
||||
|
||||
template<>
|
||||
inline std::string Option::value<std::string>() const {
|
||||
|
||||
assert(type != "UNDEFINED");
|
||||
return currentValue;
|
||||
}
|
||||
|
||||
typedef std::map<std::string, Option> OptionsMap;
|
||||
|
||||
extern OptionsMap Options;
|
||||
extern void init_uci_options();
|
||||
extern void print_uci_options();
|
||||
extern bool get_option_value_bool(const std::string& optionName);
|
||||
extern int get_option_value_int(const std::string& optionName);
|
||||
extern std::string get_option_value_string(const std::string& optionName);
|
||||
extern void set_option_value(const std::string& optionName,const std::string& newValue);
|
||||
|
||||
#endif // !defined(UCIOPTION_H_INCLUDED)
|
||||
|
|
|
|||
Loading…
Reference in New Issue