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-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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
constexpr int MaxHashMB = Is64Bit ? 131072 : 2048;
o["Debug Log File"] << Option("", on_logger);
- o["Contempt"] << Option(12, -100, 100);
+ 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["SyzygyPath"] << Option("<empty>", 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);
}
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;
}
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::Option(const char* v, const char* cur, OnChange f) : type("combo"), min(0), max(0), on_change(f)
{ defaultValue = v; currentValue = cur; }
-Option::operator int() const {
+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 {
return currentValue;
}
-bool Option::operator==(const char* s) {
+bool Option::operator==(const char* s) const {
assert(type == "combo");
return !CaseInsensitiveLess()(currentValue, s)
&& !CaseInsensitiveLess()(s, currentValue);
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 != "button")