mirror of
https://github.com/sockspls/badfish
synced 2025-04-30 00:33:09 +00:00

Add a logarithmic term in the optimism computation, increase the maximal optimism and lower the contempt offset. This increases the dynamics of the optimism aspects, giving a boost for balanced positions without skewing too much on unbalanced positions (but this version will enter panic mode faster than previous master when behind, trying to draw faster when slightly behind). This helps, since optimism is in general a good thing, for instance at LTC, but too high optimism rapidly contaminates play. passed STC: LLR: 2.96 (-2.94,2.94) [0.00,5.00] Total: 159343 W: 34489 L: 33588 D: 91266 http://tests.stockfishchess.org/tests/view/5a8db9340ebc590297cc85b6 passed LTC: LLR: 2.97 (-2.94,2.94) [0.00,5.00] Total: 47491 W: 7825 L: 7517 D: 32149 http://tests.stockfishchess.org/tests/view/5a9456a80ebc590297cc8a89 It must be mentioned that a version of the PR with contempt 0 did not pass STC [0,5]. The version in the patch, which uses default contempt 12, was found to be as strong as current master on different matches against SF7 and SF8, both at STC and LTC. One drawback maybe is that it raises the draw rate in self-play from 56% to 59%, giving a little bit less sensitivity for SF developpers to find evaluation improvements by selfplay tests in fishtest. Possible further work: • tune the values accurately, while keeping in mind the drawrate issue • check whether it is possible to remove linear and offset term • try to simplify the S-shape curve Bench: 5934644
164 lines
5.1 KiB
C++
164 lines
5.1 KiB
C++
/*
|
|
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
|
|
|
|
Stockfish is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
Stockfish is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <algorithm>
|
|
#include <cassert>
|
|
#include <ostream>
|
|
|
|
#include "misc.h"
|
|
#include "search.h"
|
|
#include "thread.h"
|
|
#include "tt.h"
|
|
#include "uci.h"
|
|
#include "syzygy/tbprobe.h"
|
|
|
|
using std::string;
|
|
|
|
UCI::OptionsMap Options; // Global object
|
|
|
|
namespace UCI {
|
|
|
|
/// 'On change' actions, triggered by an option's value change
|
|
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& o) { Threads.set(o); }
|
|
void on_tb_path(const Option& o) { Tablebases::init(o); }
|
|
|
|
|
|
/// Our case insensitive less() function as required by UCI protocol
|
|
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
|
|
|
|
return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(),
|
|
[](char c1, char c2) { return tolower(c1) < tolower(c2); });
|
|
}
|
|
|
|
|
|
/// init() initializes the UCI options to their hard-coded default values
|
|
|
|
void init(OptionsMap& o) {
|
|
|
|
// at most 2^32 clusters.
|
|
const int MaxHashMB = Is64Bit ? 131072 : 2048;
|
|
|
|
o["Debug Log File"] << Option("", on_logger);
|
|
o["Contempt"] << Option(12, -100, 100);
|
|
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(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(84, 10, 1000);
|
|
o["nodestime"] << Option(0, 0, 10000);
|
|
o["UCI_Chess960"] << 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);
|
|
}
|
|
|
|
|
|
/// 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.
|
|
|
|
std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
|
|
|
|
for (size_t idx = 0; idx < om.size(); ++idx)
|
|
for (const auto& it : om)
|
|
if (it.second.idx == idx)
|
|
{
|
|
const Option& o = it.second;
|
|
os << "\noption name " << it.first << " type " << o.type;
|
|
|
|
if (o.type != "button")
|
|
os << " default " << o.defaultValue;
|
|
|
|
if (o.type == "spin")
|
|
os << " min " << o.min << " max " << o.max;
|
|
|
|
break;
|
|
}
|
|
|
|
return os;
|
|
}
|
|
|
|
|
|
/// Option class constructors and conversion operators
|
|
|
|
Option::Option(const char* v, OnChange f) : type("string"), min(0), max(0), on_change(f)
|
|
{ defaultValue = currentValue = v; }
|
|
|
|
Option::Option(bool v, OnChange f) : type("check"), min(0), max(0), on_change(f)
|
|
{ defaultValue = currentValue = (v ? "true" : "false"); }
|
|
|
|
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)
|
|
{ defaultValue = currentValue = std::to_string(v); }
|
|
|
|
Option::operator int() const {
|
|
assert(type == "check" || type == "spin");
|
|
return (type == "spin" ? stoi(currentValue) : currentValue == "true");
|
|
}
|
|
|
|
Option::operator std::string() const {
|
|
assert(type == "string");
|
|
return currentValue;
|
|
}
|
|
|
|
|
|
/// operator<<() inits options and assigns idx in the correct printing order
|
|
|
|
void Option::operator<<(const Option& o) {
|
|
|
|
static size_t insert_order = 0;
|
|
|
|
*this = o;
|
|
idx = insert_order++;
|
|
}
|
|
|
|
|
|
/// 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 != "button" && v.empty())
|
|
|| (type == "check" && v != "true" && v != "false")
|
|
|| (type == "spin" && (stoi(v) < min || stoi(v) > max)))
|
|
return *this;
|
|
|
|
if (type != "button")
|
|
currentValue = v;
|
|
|
|
if (on_change)
|
|
on_change(*this);
|
|
|
|
return *this;
|
|
}
|
|
|
|
} // namespace UCI
|