X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=63d47f30edfcdb9f07029fb2edcb92899ce7a8e6;hp=b985ae829e5f1343e751123792925732d8cca7a5;hb=7f68fc611cc04d4dc242a9a7765942986ca44bf3;hpb=3caeabf73b12ad53ac7ba64122a2feab819c6527 diff --git a/src/ucioption.cpp b/src/ucioption.cpp index b985ae82..63d47f30 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,44 +50,27 @@ 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["Search Log Filename"] = Option("SearchLog.txt"); - o["Book File"] = Option("book.bin"); - o["Best Book Move"] = Option(false); - o["Mobility (Middle Game)"] = 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["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(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(false, on_threads); - o["Hash"] = Option(32, 4, 8192, 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["Minimum Thinking Time"] = Option(20, 0, 5000); - o["Slow Mover"] = Option(100, 10, 1000); - o["UCI_Chess960"] = Option(false); - o["UCI_AnalyseMode"] = Option(false, on_eval); + o["Write Debug Log"] << Option(false, on_logger); + o["Write Search Log"] << Option(false); + o["Search Log Filename"] << Option("SearchLog.txt"); + o["Contempt Factor"] << 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(32, 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["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); } @@ -96,7 +79,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(); ++idx) for (OptionsMap::const_iterator it = om.begin(); it != om.end(); ++it) if (it->second.idx == idx) { @@ -115,18 +98,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), 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(); } @@ -141,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. @@ -158,7 +152,7 @@ Option& Option::operator=(const string& v) { currentValue = v; if (on_change) - (*on_change)(*this); + on_change(*this); return *this; }