kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

Revert "Remove slowMover"

Browse source 
This reverts commit 77fa960f89.

Resolves #590
This commit is contained in:
Leonid Pechenik 2016-02-22 12:03:33 -05:00 • committed by Joona Kiiski
parent 77fa960f89
commit d5ba8e827d
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/timeman.cpp
View file

@ -37,25 +37,27 @@ namespace {
const double StealRatio = 0.35; // However we must not steal time from remaining moves over this ratio const double StealRatio = 0.35; // However we must not steal time from remaining moves over this ratio
// move_importance() is an exponential function based on naive observation // move_importance() is a skew-logistic function based on naive statistical
// that a game is closer to be decided after each half-move. This function // analysis of "how many games are still undecided after n half-moves". Game
// should be decreasing and with "nice" convexity properties. // is considered "undecided" as long as neither side has >275cp advantage.
// Data was extracted from the CCRL game database with some simple filtering criteria.
double move_importance(int ply) { double move_importance(int ply) {
const double PlyScale = 109.3265; const double XScale = 7.64;
const double PlyGrowth = 4.0; const double XShift = 58.4;
const double Skew = 0.183;
return exp(-pow(ply / PlyScale, PlyGrowth)) + DBL_MIN; // Ensure non-zero return pow((1 + exp((ply - XShift) / XScale)), -Skew) + DBL_MIN; // Ensure non-zero
} }
template<TimeType T> template<TimeType T>
int remaining(int myTime, int movesToGo, int ply) int remaining(int myTime, int movesToGo, int ply, int slowMover)
{ {
const double TMaxRatio = (T == OptimumTime ? 1 : MaxRatio); const double TMaxRatio = (T == OptimumTime ? 1 : MaxRatio);
const double TStealRatio = (T == OptimumTime ? 0 : StealRatio); const double TStealRatio = (T == OptimumTime ? 0 : StealRatio);
double moveImportance = move_importance(ply); double moveImportance = (move_importance(ply) * slowMover) / 100;
double otherMovesImportance = 0; double otherMovesImportance = 0;
for (int i = 1; i < movesToGo; ++i) for (int i = 1; i < movesToGo; ++i)
@ -83,6 +85,7 @@ void TimeManagement::init(Search::LimitsType& limits, Color us, int ply)
{ {
int minThinkingTime = Options["Minimum Thinking Time"]; int minThinkingTime = Options["Minimum Thinking Time"];
int moveOverhead = Options["Move Overhead"]; int moveOverhead = Options["Move Overhead"];
int slowMover = Options["Slow Mover"];
int npmsec = Options["nodestime"]; int npmsec = Options["nodestime"];
// If we have to play in 'nodes as time' mode, then convert from time // If we have to play in 'nodes as time' mode, then convert from time
@ -117,8 +120,8 @@ void TimeManagement::init(Search::LimitsType& limits, Color us, int ply)
hypMyTime = std::max(hypMyTime, 0); hypMyTime = std::max(hypMyTime, 0);
int t1 = minThinkingTime + remaining<OptimumTime>(hypMyTime, hypMTG, ply); int t1 = minThinkingTime + remaining<OptimumTime>(hypMyTime, hypMTG, ply, slowMover);
int t2 = minThinkingTime + remaining<MaxTime >(hypMyTime, hypMTG, ply); int t2 = minThinkingTime + remaining<MaxTime >(hypMyTime, hypMTG, ply, slowMover);
optimumTime = std::min(t1, optimumTime); optimumTime = std::min(t1, optimumTime);
maximumTime = std::min(t2, maximumTime); maximumTime = std::min(t2, maximumTime);

1
src/ucioption.cpp
View file

@ -67,6 +67,7 @@ void init(OptionsMap& o) {
o["Skill Level"] << Option(20, 0, 20); o["Skill Level"] << Option(20, 0, 20);
o["Move Overhead"] << Option(30, 0, 5000); o["Move Overhead"] << Option(30, 0, 5000);
o["Minimum Thinking Time"] << Option(20, 0, 5000); o["Minimum Thinking Time"] << Option(20, 0, 5000);
o["Slow Mover"] << Option(89, 10, 1000);
o["nodestime"] << Option(0, 0, 10000); o["nodestime"] << Option(0, 0, 10000);
o["UCI_Chess960"] << Option(false); o["UCI_Chess960"] << Option(false);
o["SyzygyPath"] << Option("<empty>", on_tb_path); o["SyzygyPath"] << Option("<empty>", on_tb_path);