/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2018 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
#include <algorithm>
#include <cassert>
-#include <cstdlib>
-#include <sstream>
+#include <ostream>
#include "misc.h"
+#include "search.h"
#include "thread.h"
#include "tt.h"
#include "uci.h"
-
-#ifdef SYZYGY
#include "syzygy/tbprobe.h"
-#endif
using std::string;
namespace UCI {
/// 'On change' actions, triggered by an option's value change
-void on_logger(const Option& o) { start_logger(o); }
-void on_threads(const Option&) { Threads.read_uci_options(); }
+void on_clear_hash(const Option&) { Search::clear(); }
void on_hash_size(const Option& o) { TT.resize(o); }
-void on_clear_hash(const Option&) { TT.clear(); }
-#ifdef SYZYGY
+void on_logger(const Option& o) { start_logger(o); }
+void on_threads(const Option& o) { Threads.set(o); }
void on_tb_path(const Option& o) { Tablebases::init(o); }
-#endif
/// Our case insensitive less() function as required by UCI protocol
-bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
-
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
- return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
+
+ return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(),
+ [](char c1, char c2) { return tolower(c1) < tolower(c2); });
}
void init(OptionsMap& o) {
- o["Write Debug Log"] << Option(false, on_logger);
- o["Contempt"] << Option(0, -100, 100);
- o["Min Split Depth"] << Option(0, 0, 12, on_threads);
- o["Threads"] << Option(1, 1, MAX_THREADS, on_threads);
- o["Hash"] << Option(16, 1, 1024 * 1024, on_hash_size);
+ // at most 2^32 clusters.
+ constexpr int MaxHashMB = Is64Bit ? 131072 : 2048;
+
+ 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);
-#ifdef SYZYGY
+ o["UCI_AnalyseMode"] << Option(false);
o["SyzygyPath"] << Option("<empty>", on_tb_path);
o["SyzygyProbeDepth"] << Option(1, 1, 100);
o["Syzygy50MoveRule"] << Option(true);
- o["SyzygyProbeLimit"] << Option(6, 0, 6);
-#endif
+ o["SyzygyProbeLimit"] << Option(7, 0, 7);
}
std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
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)
+ for (const auto& it : om)
+ if (it.second.idx == idx)
{
- const Option& o = it->second;
- os << "\noption name " << it->first << " type " << o.type;
+ 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;
}
+
return os;
}
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)
-{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
+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" ? atoi(currentValue.c_str()) : currentValue == "true");
+ return (type == "spin" ? stof(currentValue) : currentValue == "true");
}
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
if ( (type != "button" && v.empty())
|| (type == "check" && v != "true" && v != "false")
- || (type == "spin" && (atoi(v.c_str()) < min || atoi(v.c_str()) > max)))
+ || (type == "spin" && (stof(v) < min || stof(v) > max)))
return *this;
if (type != "button")
projects / stockfish / blobdiff