X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=062b26d70649a9528645de856ba35452e3c30c5f;hp=bc4a64814d2f747dda86c578489a46e2c249e50d;hb=4eee60343323499d087709614d47e24f66437697;hpb=cd0ecace1952f5366c836f79846d55624104a956 diff --git a/src/ucioption.cpp b/src/ucioption.cpp index bc4a6481..062b26d7 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-2014 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 @@ -38,7 +38,7 @@ namespace UCI { 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_hash_size(const Option& o) { TT.resize(o); } void on_clear_hash(const Option&) { TT.clear(); } @@ -50,45 +50,40 @@ bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const } -/// 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. +/// init() initializes the UCI options to their hard-coded default values void init(OptionsMap& o) { - int cpus = std::min(cpu_count(), MAX_THREADS); - int msd = cpus < 8 ? 4 : 7; - - o["Use Debug Log"] = Option(false, on_logger); - o["Use Search Log"] = Option(false); + 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 (Middle Game)"] = Option(100, 0, 200, on_eval); + o["Mobility (Midgame)"] = 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["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["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); - o["Hash"] = Option(32, 4, 8192, on_hash_size); + 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(200, 0, 30000); - o["Emergency Move Time"] = Option(70, 0, 5000); + 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(100, 10, 1000); + o["Slow Mover"] = Option(80, 10, 1000); o["UCI_Chess960"] = Option(false); - o["UCI_AnalyseMode"] = Option(false, on_eval); - o["pin_open"] = Option(66, -100, 100, on_eval); - o["pin_end"] = Option(11, -100, 100, on_eval); } @@ -97,7 +92,7 @@ void init(OptionsMap& o) { std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { - for (size_t idx = 0; idx < om.size(); idx++) + for (size_t idx = 0; idx < om.size() + 1; ++idx) // idx could start from 1 for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it) if (it->second.idx == idx) { @@ -116,18 +111,18 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) { } -/// Option c'tors and conversion operators +/// 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), idx(Options.size()), 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), idx(Options.size()), 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), 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) +Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f) { std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); } @@ -159,7 +154,7 @@ Option& Option::operator=(const string& v) { currentValue = v; if (on_change) - (*on_change)(*this); + on_change(*this); return *this; }