X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftimeman.cpp;h=ba0adea527249b38080288907bc500373bca353b;hp=3a4e157f8b145f1ba43de49b58c7b6db4093f643;hb=9eceb894ac91b9b4a88d1972778705304666ac33;hpb=ecc5ff6693f116f4a8ae5f5080252f29b279c0a1 diff --git a/src/timeman.cpp b/src/timeman.cpp index 3a4e157f..ba0adea5 100644 --- a/src/timeman.cpp +++ b/src/timeman.cpp @@ -2,6 +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 Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,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.0; // When in trouble, we can step over reserved time with this ratio - const double StealRatio = 0.33; // However we must not steal time from remaining moves over this ratio + 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 // move_importance() is a skew-logistic function based on naive statistical @@ -43,9 +44,9 @@ namespace { double move_importance(int ply) { - const double XScale = 9.3; - const double XShift = 59.8; - const double Skew = 0.172; + const double XScale = 7.64; + const double XShift = 58.4; + const double Skew = 0.183; return pow((1 + exp((ply - XShift) / XScale)), -Skew) + DBL_MIN; // Ensure non-zero } @@ -129,6 +130,4 @@ void TimeManagement::init(Search::LimitsType& limits, Color us, int ply) if (Options["Ponder"]) optimumTime += optimumTime / 4; - - optimumTime = std::min(optimumTime, maximumTime); }