X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fucioption.cpp;h=54f33c9ad9d5656ef7419242937910dc47067dc1;hp=828d138fd212aa1a9e71c08f6b538127dafd7a10;hb=c8589903777b6e0289640b43fae966ded442af48;hpb=2e86d1febc163e076320a6a21060fc5a1c7c0dff
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 828d138f..54f33c9a 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-2019 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
@@ -17,9 +18,9 @@
along with this program. If not, see .
*/
-#include
#include
#include
+#include
#include "misc.h"
#include "search.h"
@@ -35,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&) { Search::reset(); }
+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); }
@@ -54,26 +55,28 @@ 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.
+ constexpr int MaxHashMB = Is64Bit ? 131072 : 2048;
- o["Write Debug Log"] << Option(false, on_logger);
- o["Contempt"] << Option(0, -100, 100);
- o["Min Split Depth"] << Option(5, 0, 12, on_threads);
- o["Threads"] << Option(1, 1, MAX_THREADS, on_threads);
+ o["Debug Log File"] << Option("", on_logger);
+ o["Contempt"] << Option(24, -100, 100);
+ o["Analysis Contempt"] << Option("Both var Off var White var Black var Both", "Both");
+ 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(84, 10, 1000);
o["nodestime"] << Option(0, 0, 10000);
o["UCI_Chess960"] << Option(false);
+ o["UCI_AnalyseMode"] << Option(false);
o["SyzygyPath"] << Option("", on_tb_path);
o["SyzygyProbeDepth"] << Option(1, 1, 100);
o["Syzygy50MoveRule"] << Option(true);
- o["SyzygyProbeLimit"] << Option(6, 0, 6);
+ o["SyzygyProbeLimit"] << Option(7, 0, 7);
}
@@ -89,11 +92,13 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
const Option& o = it.second;
os << "\noption name " << it.first << " type " << o.type;
- if (o.type != "button")
+ if (o.type == "string" || o.type == "check" || o.type == "combo")
os << " default " << o.defaultValue;
if (o.type == "spin")
- os << " min " << o.min << " max " << o.max;
+ os << " default " << int(stof(o.defaultValue))
+ << " min " << o.min
+ << " max " << o.max;
break;
}
@@ -113,12 +118,15 @@ Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f)
Option::Option(OnChange f) : type("button"), min(0), max(0), on_change(f)
{}
-Option::Option(int v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f)
+Option::Option(double v, int minv, int maxv, OnChange f) : type("spin"), min(minv), max(maxv), on_change(f)
{ defaultValue = currentValue = std::to_string(v); }
-Option::operator int() const {
+Option::Option(const char* v, const char* cur, OnChange f) : type("combo"), min(0), max(0), on_change(f)
+{ defaultValue = v; currentValue = cur; }
+
+Option::operator double() const {
assert(type == "check" || type == "spin");
- return (type == "spin" ? stoi(currentValue) : currentValue == "true");
+ return (type == "spin" ? stof(currentValue) : currentValue == "true");
}
Option::operator std::string() const {
@@ -126,6 +134,12 @@ Option::operator std::string() const {
return currentValue;
}
+bool Option::operator==(const char* s) const {
+ assert(type == "combo");
+ return !CaseInsensitiveLess()(currentValue, s)
+ && !CaseInsensitiveLess()(s, currentValue);
+}
+
/// operator<<() inits options and assigns idx in the correct printing order
@@ -139,8 +153,8 @@ void Option::operator<<(const Option& o) {
/// 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.
+/// 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) {
@@ -148,9 +162,20 @@ Option& Option::operator=(const string& v) {
if ( (type != "button" && v.empty())
|| (type == "check" && v != "true" && v != "false")
- || (type == "spin" && (stoi(v) < min || stoi(v) > max)))
+ || (type == "spin" && (stof(v) < min || stof(v) > max)))
return *this;
+ if (type == "combo")
+ {
+ OptionsMap comboMap; // To have case insensitive compare
+ string token;
+ std::istringstream ss(defaultValue);
+ while (ss >> token)
+ comboMap[token] << Option();
+ if (!comboMap.count(v) || v == "var")
+ return *this;
+ }
+
if (type != "button")
currentValue = v;