X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=87ebaa833a56934aad128a155258b020fbdc45c8;hp=c78237641d061a3fa513722f13188d573165bc80;hb=254d995e187d8ecd02c3e5613e43aab525e41e22;hpb=2ca2c3f35b2e408fd97bdf7092f41e1e508eb7af diff --git a/src/ucioption.cpp b/src/ucioption.cpp index c7823764..87ebaa83 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -2,6 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) 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,9 +20,10 @@ #include #include -#include +#include #include "misc.h" +#include "search.h" #include "thread.h" #include "tt.h" #include "uci.h" @@ -34,10 +36,10 @@ 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_clear_hash(const Option&) { Search::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_threads(const Option& o) { Threads.set(o); } void on_tb_path(const Option& o) { Tablebases::init(o); } @@ -53,20 +55,21 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const void init(OptionsMap& o) { - const int MaxHashMB = Is64Bit ? 1024 * 1024 : 2048; + // at most 2^32 clusters. + const int MaxHashMB = Is64Bit ? 131072 : 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["Debug Log File"] << Option("", on_logger); + o["Contempt"] << Option(20, -100, 100); + 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(true); + 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(80, 10, 1000); + o["Slow Mover"] << Option(89, 10, 1000); + o["nodestime"] << Option(0, 0, 10000); o["UCI_Chess960"] << Option(false); o["SyzygyPath"] << Option("", on_tb_path); o["SyzygyProbeDepth"] << Option(1, 1, 100); @@ -81,7 +84,7 @@ void init(OptionsMap& o) { std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { for (size_t idx = 0; idx < om.size(); ++idx) - for (auto& it : om) + for (const auto& it : om) if (it.second.idx == idx) { const Option& o = it.second;