From 2c1ba2ab0dad2421b8ed1bd3c049634f1f00dfc3 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Sat, 18 Aug 2012 11:50:43 +0100 Subject: [PATCH] Introduce namespace UCI Ater previous patch it comes naturally to take this extra step. No functional change. Signed-off-by: Marco Costalba --- src/main.cpp | 5 +- src/uci.cpp | 2 +- src/ucioption.cpp | 118 ++++++++++++++++++++++++++-------------------- src/ucioption.h | 43 ++++++++--------- 4 files changed, 88 insertions(+), 80 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e7540f9c..dccf7b94 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,14 +28,13 @@ #include "tt.h" #include "ucioption.h" -void uci_loop(const std::string&); void kpk_bitbase_init(); int main(int argc, char* argv[]) { std::cout << engine_info() << std::endl; - UCIOptions::init(Options); + UCI::init(Options); Bitboards::init(); Position::init(); kpk_bitbase_init(); @@ -49,5 +48,5 @@ int main(int argc, char* argv[]) { for (int i = 1; i < argc; i++) args += std::string(argv[i]) + " "; - uci_loop(args); + UCI::loop(args); } diff --git a/src/uci.cpp b/src/uci.cpp index 9eab330c..7e2f7ddf 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -54,7 +54,7 @@ namespace { /// that we exit gracefully if the GUI dies unexpectedly. In addition to the UCI /// commands, the function also supports a few debug commands. -void uci_loop(const string& args) { +void UCI::loop(const string& args) { Position pos(StartFEN, false, Threads.main_thread()); // The root position string cmd, token; diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 7c38283c..bbbbbbf9 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -18,6 +18,8 @@ */ #include +#include +#include #include #include "evaluate.h" @@ -28,70 +30,69 @@ using std::string; -OptionsMap Options; // Global object +UCI::OptionsMap Options; // Global object -namespace { +namespace UCI { /// 'On change' actions, triggered by an option's value change -void on_logger(const UCIOption& opt) { start_logger(opt); } -void on_eval(const UCIOption&) { Eval::init(); } -void on_threads(const UCIOption&) { Threads.read_uci_options(); } -void on_hash_size(const UCIOption& opt) { TT.set_size(opt); } -void on_clear_hash(const UCIOption&) { TT.clear(); } +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(); } + /// Our case insensitive less() function as required by UCI protocol bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); } -} - bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less); } -/// UCIOptions::init() initializes the UCI options to their hard coded default -/// values and initializes the default value of "Threads" and "Min Split Depth" +/// 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 UCIOptions::init(OptionsMap& o) { +void init(OptionsMap& o) { int cpus = std::min(cpu_count(), MAX_THREADS); int msd = cpus < 8 ? 4 : 7; - o["Use Debug Log"] = UCIOption(false, on_logger); - o["Use Search Log"] = UCIOption(false); - o["Search Log Filename"] = UCIOption("SearchLog.txt"); - o["Book File"] = UCIOption("book.bin"); - o["Best Book Move"] = UCIOption(false); - o["Mobility (Middle Game)"] = UCIOption(100, 0, 200, on_eval); - o["Mobility (Endgame)"] = UCIOption(100, 0, 200, on_eval); - o["Passed Pawns (Middle Game)"] = UCIOption(100, 0, 200, on_eval); - o["Passed Pawns (Endgame)"] = UCIOption(100, 0, 200, on_eval); - o["Space"] = UCIOption(100, 0, 200, on_eval); - o["Aggressiveness"] = UCIOption(100, 0, 200, on_eval); - o["Cowardice"] = UCIOption(100, 0, 200, on_eval); - o["Min Split Depth"] = UCIOption(msd, 4, 7, on_threads); - o["Max Threads per Split Point"] = UCIOption(5, 4, 8, on_threads); - o["Threads"] = UCIOption(cpus, 1, MAX_THREADS, on_threads); - o["Use Sleeping Threads"] = UCIOption(true, on_threads); - o["Hash"] = UCIOption(32, 4, 8192, on_hash_size); - o["Clear Hash"] = UCIOption(on_clear_hash); - o["Ponder"] = UCIOption(true); - o["OwnBook"] = UCIOption(false); - o["MultiPV"] = UCIOption(1, 1, 500); - o["Skill Level"] = UCIOption(20, 0, 20); - o["Emergency Move Horizon"] = UCIOption(40, 0, 50); - o["Emergency Base Time"] = UCIOption(200, 0, 30000); - o["Emergency Move Time"] = UCIOption(70, 0, 5000); - o["Minimum Thinking Time"] = UCIOption(20, 0, 5000); - o["Slow Mover"] = UCIOption(100, 10, 1000); - o["UCI_Chess960"] = UCIOption(false); - o["UCI_AnalyseMode"] = UCIOption(false, on_eval); + 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["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["Aggressiveness"] = Option(100, 0, 200, on_eval); + o["Cowardice"] = 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, on_threads); + 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); } -/// operator<<() is used to output all the UCI options in chronological insertion -/// order (the idx field) and in the format defined by the UCI protocol. +/// 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. std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { @@ -99,7 +100,7 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it) if (it->second.idx == idx) { - const UCIOption& o = it->second; + const Option& o = it->second; os << "\noption name " << it->first << " type " << o.type; if (o.type != "button") @@ -114,26 +115,37 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { } -/// UCIOption class c'tors +/// Option c'tors and conversion operators -UCIOption::UCIOption(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f) { defaultValue = currentValue = v; } -UCIOption::UCIOption(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f) { defaultValue = currentValue = (v ? "true" : "false"); } -UCIOption::UCIOption(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f) {} -UCIOption::UCIOption(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f) +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(); } -/// UCIOption::operator=() updates currentValue. Normally it's up to the GUI to -/// check for option's limits, but we could receive the new value directly from +Option::operator int() const { + assert(type == "check" || type == "spin"); + return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true"); +} + +Option::operator std::string() const { + assert(type == "string"); + return currentValue; +} + + +/// 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. -UCIOption& UCIOption::operator=(const string& v) { +Option& Option::operator=(const string& v) { assert(!type.empty()); @@ -150,3 +162,5 @@ UCIOption& UCIOption::operator=(const string& v) { return *this; } + +} // namespace UCI diff --git a/src/ucioption.h b/src/ucioption.h index b78bf6fd..df8797fe 100644 --- a/src/ucioption.h +++ b/src/ucioption.h @@ -20,12 +20,12 @@ #if !defined(UCIOPTION_H_INCLUDED) #define UCIOPTION_H_INCLUDED -#include -#include #include #include -class UCIOption; +namespace UCI { + +class Option; /// Custom comparator because UCI options should be case insensitive struct CaseInsensitiveLess { @@ -33,30 +33,22 @@ struct CaseInsensitiveLess { }; /// Our options container is actually a std::map -typedef std::map OptionsMap; +typedef std::map OptionsMap; -/// UCIOption class implements an option as defined by UCI protocol -class UCIOption { +/// Option class implements an option as defined by UCI protocol +class Option { - typedef void (Fn)(const UCIOption&); + typedef void (Fn)(const Option&); public: - UCIOption(Fn* = NULL); - UCIOption(bool v, Fn* = NULL); - UCIOption(const char* v, Fn* = NULL); - UCIOption(int v, int min, int max, Fn* = NULL); - - UCIOption& operator=(const std::string& v); + Option(Fn* = NULL); + Option(bool v, Fn* = NULL); + Option(const char* v, Fn* = NULL); + Option(int v, int min, int max, Fn* = NULL); - operator int() const { - assert(type == "check" || type == "spin"); - return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true"); - } - - operator std::string() const { - assert(type == "string"); - return currentValue; - } + Option& operator=(const std::string& v); + operator int() const; + operator std::string() const; private: friend std::ostream& operator<<(std::ostream&, const OptionsMap&); @@ -67,8 +59,11 @@ private: Fn* on_change; }; -extern OptionsMap Options; +void init(OptionsMap&); +void loop(const std::string&); + +} // namespace UCI -namespace UCIOptions { void init(OptionsMap&); } +extern UCI::OptionsMap Options; #endif // !defined(UCIOPTION_H_INCLUDED) -- 2.39.2