X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=417765a54b6c3a487803df7481752cf286771876;hp=eae549ad63f413b077ea9d6828cf6887ea86be54;hb=40c863d41af5058a02f1de3423a000d801dcb08a;hpb=8447248705bc6cf91fc8cdbb519c31925862ea74
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index eae549ad..417765a5 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-2010 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
@@ -17,154 +17,148 @@
along with this program. If not, see .
*/
-#include
-#include
+#include
+#include
+#include
#include
+#include "evaluate.h"
#include "misc.h"
#include "thread.h"
+#include "tt.h"
#include "ucioption.h"
using std::string;
-using std::cout;
-using std::endl;
-OptionsMap Options; // Global object
+UCI::OptionsMap Options; // Global object
+namespace UCI {
-// Our case insensitive less() function as required by UCI protocol
-bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
-
- int c1, c2;
- size_t i = 0;
+/// '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_hash_size(const Option& o) { TT.set_size(o); }
+void on_clear_hash(const Option&) { TT.clear(); }
- while (i < s1.size() && i < s2.size())
- {
- c1 = tolower(s1[i]);
- c2 = tolower(s2[i++]);
-
- if (c1 != c2)
- return c1 < c2;
- }
- return s1.size() < s2.size();
-}
+/// Our case insensitive less() function as required by UCI protocol
+bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
-// stringify() converts a numeric value of type T to a std::string
-template
-static string stringify(const T& v) {
-
- std::ostringstream ss;
- ss << v;
- return ss.str();
+bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
}
-/// OptionsMap c'tor initializes the UCI options to their hard coded default
-/// values and initializes the default value of "Threads" and "Minimum Split Depth"
-/// parameters according to the number of CPU cores.
-
-OptionsMap::OptionsMap() {
-
- OptionsMap& o = *this;
-
- 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);
- o["Mobility (Endgame)"] = UCIOption(100, 0, 200);
- o["Passed Pawns (Middle Game)"] = UCIOption(100, 0, 200);
- o["Passed Pawns (Endgame)"] = UCIOption(100, 0, 200);
- o["Space"] = UCIOption(100, 0, 200);
- o["Aggressiveness"] = UCIOption(100, 0, 200);
- o["Cowardice"] = UCIOption(100, 0, 200);
- o["Minimum Split Depth"] = UCIOption(4, 4, 7);
- o["Maximum Number of Threads per Split Point"] = UCIOption(5, 4, 8);
- o["Threads"] = UCIOption(1, 1, MAX_THREADS);
- o["Use Sleeping Threads"] = UCIOption(true);
- o["Hash"] = UCIOption(32, 4, 8192);
- o["Clear Hash"] = UCIOption(false, "button");
- o["Ponder"] = UCIOption(true);
- o["OwnBook"] = UCIOption(true);
- 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["UCI_Chess960"] = UCIOption(false);
- o["UCI_AnalyseMode"] = UCIOption(false);
-
- // Set some SMP parameters accordingly to the detected CPU count
- UCIOption& thr = o["Threads"];
- UCIOption& msd = o["Minimum Split Depth"];
-
- thr.defaultValue = thr.currentValue = stringify(cpu_count());
-
- if (cpu_count() >= 8)
- msd.defaultValue = msd.currentValue = stringify(7);
+/// init() initializes the UCI options to their hard-coded default values
+
+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["Max Threads per Split Point"] = Option(5, 4, 8, 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(70, 10, 1000);
+ o["UCI_Chess960"] = Option(false);
+ o["UCI_AnalyseMode"] = Option(false, on_eval);
}
-/// OptionsMap::print_all() returns a string with all the UCI options in chronological
+/// 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.
-string OptionsMap::print_all() const {
-
- std::stringstream s;
+std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
- for (size_t i = 0; i <= size(); i++)
- for (OptionsMap::const_iterator it = begin(); it != end(); ++it)
- if (it->second.idx == i)
+ 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)
{
- const UCIOption& o = it->second;
- s << "\noption name " << it->first << " type " << o.type;
+ const Option& o = it->second;
+ os << "\noption name " << it->first << " type " << o.type;
if (o.type != "button")
- s << " default " << o.defaultValue;
+ os << " default " << o.defaultValue;
if (o.type == "spin")
- s << " min " << o.minValue << " max " << o.maxValue;
+ os << " min " << o.min << " max " << o.max;
break;
}
- return s.str();
+ return os;
}
-/// Option class c'tors
+/// Option class constructors and conversion operators
-UCIOption::UCIOption(const char* def) : type("string"), minValue(0), maxValue(0), idx(Options.size())
-{ defaultValue = currentValue = def; }
+Option::Option(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f)
+{ defaultValue = currentValue = v; }
-UCIOption::UCIOption(bool def, string t) : type(t), minValue(0), maxValue(0), idx(Options.size())
-{ defaultValue = currentValue = (def ? "true" : "false"); }
+Option::Option(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f)
+{ defaultValue = currentValue = (v ? "true" : "false"); }
-UCIOption::UCIOption(int def, int minv, int maxv) : type("spin"), minValue(minv), maxValue(maxv), idx(Options.size())
-{ defaultValue = currentValue = stringify(def); }
+Option::Option(Fn* 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)
+{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
-/// set_value() updates currentValue of the Option object. Normally it's up to
-/// the GUI to check for option's limits, but we could receive the new value
-/// directly from the user by teminal window. So let's check the bounds anyway.
-void UCIOption::set_value(const string& v) {
+Option::operator int() const {
+ assert(type == "check" || type == "spin");
+ return (type == "spin" ? atoi(currentValue.c_str()) : currentValue == "true");
+}
+
+Option::operator std::string() const {
+ assert(type == "string");
+ return currentValue;
+}
+
+
+/// 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.
+
+Option& Option::operator=(const string& v) {
assert(!type.empty());
- if (v.empty())
- return;
+ if ( (type != "button" && v.empty())
+ || (type == "check" && v != "true" && v != "false")
+ || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max)))
+ return *this;
- if ((type == "check" || type == "button") != (v == "true" || v == "false"))
- return;
+ if (type != "button")
+ currentValue = v;
- if (type == "spin")
- {
- int val = atoi(v.c_str());
- if (val < minValue || val > maxValue)
- return;
- }
+ if (on_change)
+ (*on_change)(*this);
- currentValue = v;
+ return *this;
}
+
+} // namespace UCI