X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fucioption.cpp;h=54f33c9ad9d5656ef7419242937910dc47067dc1;hb=5b5687d76e7dc10af9ebaa91f03190db9a9f8d27;hp=5c891421ec9447ae99d726a1bf9c7bb0dd5cecd0;hpb=86e467520f780c8b2cfbfe2b4451987de66882c7;p=stockfish
diff --git a/src/ucioption.cpp b/src/ucioption.cpp
index 5c891421..54f33c9a 100644
--- a/src/ucioption.cpp
+++ b/src/ucioption.cpp
@@ -2,7 +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-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
@@ -18,9 +18,9 @@
along with this program. If not, see .
*/
-#include
#include
#include
+#include
#include "misc.h"
#include "search.h"
@@ -59,7 +59,7 @@ void init(OptionsMap& o) {
constexpr int MaxHashMB = Is64Bit ? 131072 : 2048;
o["Debug Log File"] << Option("", on_logger);
- o["Contempt"] << Option(21, -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);
@@ -76,7 +76,7 @@ void init(OptionsMap& o) {
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);
}
@@ -134,10 +134,10 @@ 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);
+ return !CaseInsensitiveLess()(currentValue, s)
+ && !CaseInsensitiveLess()(s, currentValue);
}
@@ -153,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) {
@@ -165,6 +165,17 @@ Option& Option::operator=(const string& v) {
|| (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;