X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=23e00180fd29562cf72d8d5922d63c203ed9936b;hp=417765a54b6c3a487803df7481752cf286771876;hb=b15dcd977487c58409de48016eb7680850481d5d;hpb=40c863d41af5058a02f1de3423a000d801dcb08a diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 417765a5..23e00180 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -22,11 +22,11 @@ #include #include -#include "evaluate.h" #include "misc.h" #include "thread.h" #include "tt.h" -#include "ucioption.h" +#include "uci.h" +#include "syzygy/tbprobe.h" using std::string; @@ -35,11 +35,11 @@ UCI::OptionsMap Options; // Global object namespace UCI { /// 'On change' actions, triggered by an option's value change +void on_clear_hash(const Option&) { TT.clear(); } +void on_hash_size(const Option& o) { TT.resize(o); } 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 on_tb_path(const Option& o) { Tablebases::init(o); } /// Our case insensitive less() function as required by UCI protocol @@ -54,38 +54,23 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const void init(OptionsMap& o) { - o["Write Debug Log"] = Option(false, on_logger); - o["Write 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 (Midgame)"] = Option(100, 0, 200, on_eval); - o["Mobility (Endgame)"] = Option(100, 0, 200, on_eval); - o["Pawn Structure (Midgame)"] = Option(100, 0, 200, on_eval); - o["Pawn Structure (Endgame)"] = Option(100, 0, 200, on_eval); - o["Passed Pawns (Midgame)"] = 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(0, 0, 12, on_threads); - o["Max Threads per Split Point"] = Option(5, 4, 8, on_threads); - o["Threads"] = Option(1, 1, MAX_THREADS, on_threads); - o["Idle Threads Sleep"] = Option(true); - o["Hash"] = Option(32, 1, 16384, 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(60, 0, 30000); - o["Emergency Move Time"] = Option(30, 0, 5000); - o["Minimum Thinking Time"] = Option(20, 0, 5000); - o["Slow Mover"] = Option(70, 10, 1000); - o["UCI_Chess960"] = Option(false); - o["UCI_AnalyseMode"] = Option(false, on_eval); + o["Write Debug Log"] << Option(false, on_logger); + o["Contempt"] << Option(0, -100, 100); + o["Min Split Depth"] << Option(0, 0, 12, on_threads); + o["Threads"] << Option(1, 1, MAX_THREADS, on_threads); + o["Hash"] << Option(16, 1, 1024 * 1024, on_hash_size); + o["Clear Hash"] << Option(on_clear_hash); + o["Ponder"] << Option(true); + o["MultiPV"] << Option(1, 1, 500); + o["Skill Level"] << Option(20, 0, 20); + o["Move Overhead"] << Option(30, 0, 5000); + o["Minimum Thinking Time"] << Option(20, 0, 5000); + o["Slow Mover"] << Option(80, 10, 1000); + o["UCI_Chess960"] << Option(false); + o["SyzygyPath"] << Option("", on_tb_path); + o["SyzygyProbeDepth"] << Option(1, 1, 100); + o["Syzygy50MoveRule"] << Option(true); + o["SyzygyProbeLimit"] << Option(6, 0, 6); } @@ -115,16 +100,16 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { /// Option class constructors and conversion operators -Option::Option(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), on_change(f) { defaultValue = currentValue = v; } -Option::Option(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f) { defaultValue = currentValue = (v ? "true" : "false"); } -Option::Option(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f) +Option::Option(OnChange f) : type("button"), min(0), max(0), 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) +Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f) { std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); } @@ -139,6 +124,17 @@ Option::operator std::string() const { } +/// operator<<() inits options and assigns idx in the correct printing order + +void Option::operator<<(const Option& o) { + + static size_t insert_order = 0; + + *this = o; + idx = insert_order++; +} + + /// 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. @@ -156,7 +152,7 @@ Option& Option::operator=(const string& v) { currentValue = v; if (on_change) - (*on_change)(*this); + on_change(*this); return *this; }