X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=909618090cb6144af2661ced343a4415f5f3fb7e;hp=de4e07fb38a6f37189e5793e899a17f93998a5c6;hb=49e110c52b19f5c99954d4797b8e991b0b60007c;hpb=631fa6a1006e487a47b0feb662e5365f9258a2ef
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index de4e07fb..90961809 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-2013 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,162 +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);
}
-/// init_uci_options() 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.
-
-void init_uci_options() {
-
- Options["Use Search Log"] = Option(false);
- Options["Search Log Filename"] = Option("SearchLog.txt");
- Options["Book File"] = Option("book.bin");
- Options["Best Book Move"] = Option(false);
- Options["Mobility (Middle Game)"] = Option(100, 0, 200);
- Options["Mobility (Endgame)"] = Option(100, 0, 200);
- Options["Pawn Structure (Middle Game)"] = Option(100, 0, 200);
- Options["Pawn Structure (Endgame)"] = Option(100, 0, 200);
- Options["Passed Pawns (Middle Game)"] = Option(100, 0, 200);
- Options["Passed Pawns (Endgame)"] = Option(100, 0, 200);
- Options["Space"] = Option(100, 0, 200);
- Options["Aggressiveness"] = Option(100, 0, 200);
- Options["Cowardice"] = Option(100, 0, 200);
- Options["Check Extension (PV nodes)"] = Option(2, 0, 2);
- Options["Check Extension (non-PV nodes)"] = Option(1, 0, 2);
- Options["Single Evasion Extension (PV nodes)"] = Option(2, 0, 2);
- Options["Single Evasion Extension (non-PV nodes)"] = Option(2, 0, 2);
- Options["Mate Threat Extension (PV nodes)"] = Option(2, 0, 2);
- Options["Mate Threat Extension (non-PV nodes)"] = Option(2, 0, 2);
- Options["Pawn Push to 7th Extension (PV nodes)"] = Option(1, 0, 2);
- Options["Pawn Push to 7th Extension (non-PV nodes)"] = Option(1, 0, 2);
- Options["Passed Pawn Extension (PV nodes)"] = Option(1, 0, 2);
- Options["Passed Pawn Extension (non-PV nodes)"] = Option(0, 0, 2);
- Options["Pawn Endgame Extension (PV nodes)"] = Option(2, 0, 2);
- Options["Pawn Endgame Extension (non-PV nodes)"] = Option(2, 0, 2);
- Options["Minimum Split Depth"] = Option(4, 4, 7);
- Options["Maximum Number of Threads per Split Point"] = Option(5, 4, 8);
- Options["Threads"] = Option(1, 1, MAX_THREADS);
- Options["Use Sleeping Threads"] = Option(true);
- Options["Hash"] = Option(32, 4, 8192);
- Options["Clear Hash"] = Option(false, "button");
- Options["Ponder"] = Option(true);
- Options["OwnBook"] = Option(true);
- Options["MultiPV"] = Option(1, 1, 500);
- Options["Emergency Move Horizon"] = Option(40, 0, 50);
- Options["Emergency Base Time"] = Option(200, 0, 60000);
- Options["Emergency Move Time"] = Option(70, 0, 5000);
- Options["Minimum Thinking Time"] = Option(20, 0, 5000);
- Options["UCI_Chess960"] = Option(false);
- Options["UCI_AnalyseMode"] = Option(false);
-
- // Set some SMP parameters accordingly to the detected CPU count
- Option& thr = Options["Threads"];
- Option& msd = Options["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, 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(50, 10, 1000);
+ o["UCI_Chess960"] = Option(false);
+ o["UCI_AnalyseMode"] = Option(false, on_eval);
}
-/// print_uci_options() prints all the UCI options to the standard output,
-/// in chronological insertion order (the idx field) and in the format
-/// defined by the UCI protocol.
+/// 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.
-void print_uci_options() {
+std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
- for (size_t i = 0; i <= Options.size(); i++)
- for (OptionsMap::const_iterator it = Options.begin(); it != Options.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 Option& o = it->second;
- cout << "\noption name " << it->first << " type " << o.type;
+ os << "\noption name " << it->first << " type " << o.type;
if (o.type != "button")
- cout << " default " << o.defaultValue;
+ os << " default " << o.defaultValue;
if (o.type == "spin")
- cout << " min " << o.minValue << " max " << o.maxValue;
+ os << " min " << o.min << " max " << o.max;
break;
}
- cout << endl;
+ return os;
}
-/// Option class c'tors
+/// Option c'tors and conversion operators
+
+Option::Option(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f)
+{ defaultValue = currentValue = v; }
-Option::Option(const char* def) : type("string"), idx(Options.size()), minValue(0), maxValue(0)
-{ defaultValue = currentValue = def; }
+Option::Option(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f)
+{ defaultValue = currentValue = (v ? "true" : "false"); }
-Option::Option(bool def, string t) : type(t), idx(Options.size()), minValue(0), maxValue(0)
-{ defaultValue = currentValue = (def ? "true" : "false"); }
+Option::Option(Fn* f) : type("button"), min(0), max(0), idx(Options.size()), on_change(f)
+{}
-Option::Option(int def, int minv, int maxv) : type("spin"), idx(Options.size()), minValue(minv), maxValue(maxv)
-{ defaultValue = currentValue = stringify(def); }
+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.
+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;
+}
+
-void Option::set_value(const string& value) {
+/// 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 ( (type == "check" || type == "button")
- && !(value == "true" || value == "false"))
- 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 != "button")
+ currentValue = v;
- if (type == "spin")
- {
- int v = atoi(value.c_str());
- if (v < minValue || v > maxValue)
- return;
- }
+ if (on_change)
+ (*on_change)(*this);
- currentValue = value;
+ return *this;
}
+
+} // namespace UCI