X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=06641cf5081908aa04c804b4ba2e75c022cc2db2;hp=03946e8bd5a0027a7d3a9b37ae4ff17d42925d60;hb=cb2111f0b62afec5fd977e1dd4ca5843bd006956;hpb=258da28e79d99f75e0b626697bda2d459a37c0e6 diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 03946e8b..06641cf5 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 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 @@ -18,90 +18,74 @@ */ #include +#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; -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) { logger_set(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_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_threads(const Option&) { Threads.read_uci_options(); } +void on_tb_path(const Option& o) { Tablebases::init(o); } -/// Our case insensitive less() function as required by UCI protocol -bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); } - -} +/// Our case insensitive less() function as required by UCI protocol bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { - return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less); + + return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), + [](char c1, char c2) { return tolower(c1) < tolower(c2); }); } -/// OptionsMap c'tor 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. - -OptionsMap::OptionsMap() { - - int cpus = std::min(cpu_count(), MAX_THREADS); - int msd = cpus < 8 ? 4 : 7; - OptionsMap& o = *this; - - 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); - 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); +/// init() initializes the UCI options to their hard-coded default values + +void init(OptionsMap& o) { + + const int MaxHashMB = Is64Bit ? 1024 * 1024 : 2048; + + 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, MaxHashMB, 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); } -/// 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) { - for (size_t idx = 0; idx < om.size(); idx++) - for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it) - if (it->second.idx == idx) + for (size_t idx = 0; idx < om.size(); ++idx) + for (const auto& it : om) + if (it.second.idx == idx) { - const UCIOption& o = it->second; - os << "\noption name " << it->first << " type " << o.type; + const Option& o = it.second; + os << "\noption name " << it.first << " type " << o.type; if (o.type != "button") os << " default " << o.defaultValue; @@ -111,41 +95,67 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { break; } + return os; } -/// UCIOption class c'tors +/// Option class constructors 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, OnChange f) : type("string"), min(0), max(0), 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, OnChange f) : type("check"), min(0), max(0), 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(OnChange f) : type("button"), min(0), max(0), 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) -{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); } +Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f) +{ defaultValue = currentValue = std::to_string(v); } + +Option::operator int() const { + assert(type == "check" || type == "spin"); + return (type == "spin" ? stoi(currentValue) : currentValue == "true"); +} + +Option::operator std::string() const { + assert(type == "string"); + return currentValue; +} -/// 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 +/// 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. -void UCIOption::operator=(const string& v) { +Option& Option::operator=(const string& v) { assert(!type.empty()); - if ( (type == "button" || !v.empty()) - && (type != "check" || (v == "true" || v == "false")) - && (type != "spin" || (atoi(v.c_str()) >= min && atoi(v.c_str()) <= max))) - { - if (type != "button") - currentValue = v; + if ( (type != "button" && v.empty()) + || (type == "check" && v != "true" && v != "false") + || (type == "spin" && (stoi(v) < min || stoi(v) > max))) + return *this; + + if (type != "button") + currentValue = v; - if (on_change) - (*on_change)(*this); - } + if (on_change) + on_change(*this); + + return *this; } + +} // namespace UCI