X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftimeman.cpp;h=f6ead0b2a7acf18b8a076c04a5138b428aad52a7;hp=0bc9c159bbe2f3a5175e1423d2ba2cc6a1e6e7e2;hb=2c5dfb312205de03239cb15e79b501789c4cd067;hpb=89723339d93c87f52e148080d5b1dc101ee76685 diff --git a/src/timeman.cpp b/src/timeman.cpp index 0bc9c159..f6ead0b2 100644 --- a/src/timeman.cpp +++ b/src/timeman.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-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -33,8 +33,8 @@ namespace { enum TimeType { OptimumTime, MaxTime }; const int MoveHorizon = 50; // Plan time management at most this many moves ahead - const double MaxRatio = 7.09; // When in trouble, we can step over reserved time with this ratio - const double StealRatio = 0.35; // However we must not steal time from remaining moves over this ratio + const double MaxRatio = 7.3; // When in trouble, we can step over reserved time with this ratio + const double StealRatio = 0.34; // However we must not steal time from remaining moves over this ratio // move_importance() is a skew-logistic function based on naive statistical @@ -44,16 +44,16 @@ namespace { double move_importance(int ply) { - const double XScale = 7.64; - const double XShift = 58.4; - const double Skew = 0.183; + const double XScale = 6.85; + const double XShift = 64.5; + const double Skew = 0.171; return pow((1 + exp((ply - XShift) / XScale)), -Skew) + DBL_MIN; // Ensure non-zero } template - int remaining(int myTime, int movesToGo, int ply, int slowMover) - { + int remaining(int myTime, int movesToGo, int ply, int slowMover) { + const double TMaxRatio = (T == OptimumTime ? 1 : MaxRatio); const double TStealRatio = (T == OptimumTime ? 0 : StealRatio); @@ -81,8 +81,8 @@ namespace { /// inc > 0 && movestogo == 0 means: x basetime + z increment /// inc > 0 && movestogo != 0 means: x moves in y minutes + z increment -void TimeManagement::init(Search::LimitsType& limits, Color us, int ply) -{ +void TimeManagement::init(Search::LimitsType& limits, Color us, int ply) { + int minThinkingTime = Options["Minimum Thinking Time"]; int moveOverhead = Options["Move Overhead"]; int slowMover = Options["Slow Mover"]; @@ -104,7 +104,6 @@ void TimeManagement::init(Search::LimitsType& limits, Color us, int ply) } startTime = limits.startTime; - unstablePvFactor = 1; optimumTime = maximumTime = std::max(limits.time[us], minThinkingTime); const int MaxMTG = limits.movestogo ? std::min(limits.movestogo, MoveHorizon) : MoveHorizon;