X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=ed68027de720ec2d86bb49fb3c7d0afbb6ca6b17;hp=e117e44c862205e37f7901a0e0cc59e3a97b4bf7;hb=9afa03b80ea4610729427ee8287a5bbadba03e02;hpb=64d29a633066e39b62af5ee0bbf32645994744ec diff --git a/src/ucioption.cpp b/src/ucioption.cpp index e117e44c..ed68027d 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -1,7 +1,8 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -19,14 +20,14 @@ #include #include -#include -#include +#include -#include "evaluate.h" #include "misc.h" +#include "search.h" #include "thread.h" #include "tt.h" -#include "ucioption.h" +#include "uci.h" +#include "syzygy/tbprobe.h" using std::string; @@ -35,18 +36,18 @@ UCI::OptionsMap Options; // Global object namespace UCI { /// 'On change' actions, triggered by an option's value change -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_clear_hash(const Option&) { Search::clear(); } void on_hash_size(const Option& o) { TT.resize(o); } -void on_clear_hash(const Option&) { TT.clear(); } +void on_logger(const Option& o) { start_logger(o); } +void on_threads(const Option& o) { Threads.set(o); } +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); } - bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const { - return std::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); }); } @@ -54,36 +55,28 @@ 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["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(80, 10, 1000); - o["UCI_Chess960"] << Option(false); + // at most 2^32 clusters. + constexpr int MaxHashMB = Is64Bit ? 131072 : 2048; + + o["Debug Log File"] << Option("", on_logger); + o["Contempt"] << Option(21, -100, 100); + o["Analysis Contempt"] << Option("Both var Off var White var Black var Both", "Both"); + o["Threads"] << Option(1, 1, 512, on_threads); + o["Hash"] << Option(16, 1, MaxHashMB, on_hash_size); + o["Clear Hash"] << Option(on_clear_hash); + o["Ponder"] << Option(false); + 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(84, 10, 1000); + o["nodestime"] << Option(0, 0, 10000); + o["UCI_Chess960"] << Option(false); + o["UCI_AnalyseMode"] << Option(false); + o["SyzygyPath"] << Option("", on_tb_path); + o["SyzygyProbeDepth"] << Option(1, 1, 100); + o["Syzygy50MoveRule"] << Option(true); + o["SyzygyProbeLimit"] << Option(7, 0, 7); } @@ -93,20 +86,23 @@ void init(OptionsMap& o) { 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 (const auto& it : om) + if (it.second.idx == idx) { - const Option& 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") + if (o.type == "string" || o.type == "check" || o.type == "combo") os << " default " << o.defaultValue; if (o.type == "spin") - os << " min " << o.min << " max " << o.max; + os << " default " << int(stof(o.defaultValue)) + << " min " << o.min + << " max " << o.max; break; } + return os; } @@ -122,13 +118,15 @@ Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f) Option::Option(OnChange f) : type("button"), min(0), max(0), 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(); } +Option::Option(double v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f) +{ defaultValue = currentValue = std::to_string(v); } +Option::Option(const char* v, const char* cur, OnChange f) : type("combo"), min(0), max(0), on_change(f) +{ defaultValue = v; currentValue = cur; } -Option::operator int() const { +Option::operator double() const { assert(type == "check" || type == "spin"); - return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true"); + return (type == "spin" ? stof(currentValue) : currentValue == "true"); } Option::operator std::string() const { @@ -136,6 +134,12 @@ Option::operator std::string() const { return currentValue; } +bool Option::operator==(const char* s) const { + assert(type == "combo"); + return !CaseInsensitiveLess()(currentValue, s) + && !CaseInsensitiveLess()(s, currentValue); +} + /// operator<<() inits options and assigns idx in the correct printing order @@ -158,7 +162,7 @@ Option& Option::operator=(const string& v) { if ( (type != "button" && v.empty()) || (type == "check" && v != "true" && v != "false") - || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max))) + || (type == "spin" && (stof(v) < min || stof(v) > max))) return *this; if (type != "button")