X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftimeman.cpp;fp=src%2Ftimeman.cpp;h=f404ee0c353eb96215db47c14c500e3bc1c58246;hp=061de0182f7d75e698d73664b9bf3a25dd603e4b;hb=bfee35f930bac95b646b1821339f342c70aac2f6;hpb=487c21b1aa64dcc09dd95b845a66f39ae3c3754e
diff --git a/src/timeman.cpp b/src/timeman.cpp
index 061de018..f404ee0c 100644
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -16,94 +16,92 @@
along with this program. If not, see .
*/
+#include "timeman.h"
+
#include
-#include
#include
#include "search.h"
-#include "timeman.h"
#include "uci.h"
namespace Stockfish {
-TimeManagement Time; // Our global time management object
+TimeManagement Time; // Our global time management object
-/// TimeManagement::init() is called at the beginning of the search and calculates
-/// the bounds of time allowed for the current game ply. We currently support:
+// Called at the beginning of the search and calculates
+// the bounds of time allowed for the current game ply. We currently support:
// 1) x basetime (+ z increment)
// 2) x moves in y seconds (+ z increment)
-
void TimeManagement::init(Search::LimitsType& limits, Color us, int ply) {
- // if we have no time, no need to initialize TM, except for the start time,
- // which is used by movetime.
- startTime = limits.startTime;
- if (limits.time[us] == 0)
- return;
-
- TimePoint moveOverhead = TimePoint(Options["Move Overhead"]);
- TimePoint slowMover = TimePoint(Options["Slow Mover"]);
- TimePoint npmsec = TimePoint(Options["nodestime"]);
-
- // optScale is a percentage of available time to use for the current move.
- // maxScale is a multiplier applied to optimumTime.
- double optScale, maxScale;
-
- // If we have to play in 'nodes as time' mode, then convert from time
- // to nodes, and use resulting values in time management formulas.
- // WARNING: to avoid time losses, the given npmsec (nodes per millisecond)
- // must be much lower than the real engine speed.
- if (npmsec)
- {
- if (!availableNodes) // Only once at game start
- availableNodes = npmsec * limits.time[us]; // Time is in msec
-
- // Convert from milliseconds to nodes
- limits.time[us] = TimePoint(availableNodes);
- limits.inc[us] *= npmsec;
- limits.npmsec = npmsec;
- }
-
- // Maximum move horizon of 50 moves
- int mtg = limits.movestogo ? std::min(limits.movestogo, 50) : 50;
-
- // Make sure timeLeft is > 0 since we may use it as a divisor
- TimePoint timeLeft = std::max(TimePoint(1),
- limits.time[us] + limits.inc[us] * (mtg - 1) - moveOverhead * (2 + mtg));
-
- // Use extra time with larger increments
- double optExtra = std::clamp(1.0 + 12.0 * limits.inc[us] / limits.time[us], 1.0, 1.12);
-
- // A user may scale time usage by setting UCI option "Slow Mover"
- // Default is 100 and changing this value will probably lose elo.
- timeLeft = slowMover * timeLeft / 100;
-
- // x basetime (+ z increment)
- // If there is a healthy increment, timeLeft can exceed actual available
- // game time for the current move, so also cap to 20% of available game time.
- if (limits.movestogo == 0)
- {
- optScale = std::min(0.0120 + std::pow(ply + 3.0, 0.45) * 0.0039,
- 0.2 * limits.time[us] / double(timeLeft))
+ // If we have no time, no need to initialize TM, except for the start time,
+ // which is used by movetime.
+ startTime = limits.startTime;
+ if (limits.time[us] == 0)
+ return;
+
+ TimePoint moveOverhead = TimePoint(Options["Move Overhead"]);
+ TimePoint npmsec = TimePoint(Options["nodestime"]);
+
+ // optScale is a percentage of available time to use for the current move.
+ // maxScale is a multiplier applied to optimumTime.
+ double optScale, maxScale;
+
+ // If we have to play in 'nodes as time' mode, then convert from time
+ // to nodes, and use resulting values in time management formulas.
+ // WARNING: to avoid time losses, the given npmsec (nodes per millisecond)
+ // must be much lower than the real engine speed.
+ if (npmsec)
+ {
+ if (!availableNodes) // Only once at game start
+ availableNodes = npmsec * limits.time[us]; // Time is in msec
+
+ // Convert from milliseconds to nodes
+ limits.time[us] = TimePoint(availableNodes);
+ limits.inc[us] *= npmsec;
+ limits.npmsec = npmsec;
+ }
+
+ // Maximum move horizon of 50 moves
+ int mtg = limits.movestogo ? std::min(limits.movestogo, 50) : 50;
+
+ // Make sure timeLeft is > 0 since we may use it as a divisor
+ TimePoint timeLeft = std::max(TimePoint(1), limits.time[us] + limits.inc[us] * (mtg - 1)
+ - moveOverhead * (2 + mtg));
+
+ // Use extra time with larger increments
+ double optExtra = std::clamp(1.0 + 12.5 * limits.inc[us] / limits.time[us], 1.0, 1.11);
+
+ // Calculate time constants based on current time left.
+ double optConstant = std::min(0.00334 + 0.0003 * std::log10(limits.time[us] / 1000.0), 0.0049);
+ double maxConstant = std::max(3.4 + 3.0 * std::log10(limits.time[us] / 1000.0), 2.76);
+
+ // x basetime (+ z increment)
+ // If there is a healthy increment, timeLeft can exceed actual available
+ // game time for the current move, so also cap to 20% of available game time.
+ if (limits.movestogo == 0)
+ {
+ optScale = std::min(0.0120 + std::pow(ply + 3.1, 0.44) * optConstant,
+ 0.21 * limits.time[us] / double(timeLeft))
* optExtra;
- maxScale = std::min(7.0, 4.0 + ply / 12.0);
- }
-
- // x moves in y seconds (+ z increment)
- else
- {
- optScale = std::min((0.88 + ply / 116.4) / mtg,
- 0.88 * limits.time[us] / double(timeLeft));
- maxScale = std::min(6.3, 1.5 + 0.11 * mtg);
- }
-
- // Never use more than 80% of the available time for this move
- optimumTime = TimePoint(optScale * timeLeft);
- maximumTime = TimePoint(std::min(0.8 * limits.time[us] - moveOverhead, maxScale * optimumTime));
-
- if (Options["Ponder"])
- optimumTime += optimumTime / 4;
+ maxScale = std::min(6.9, maxConstant + ply / 12.2);
+ }
+
+ // x moves in y seconds (+ z increment)
+ else
+ {
+ optScale = std::min((0.88 + ply / 116.4) / mtg, 0.88 * limits.time[us] / double(timeLeft));
+ maxScale = std::min(6.3, 1.5 + 0.11 * mtg);
+ }
+
+ // Limit the maximum possible time for this move
+ optimumTime = TimePoint(optScale * timeLeft);
+ maximumTime =
+ TimePoint(std::min(0.84 * limits.time[us] - moveOverhead, maxScale * optimumTime)) - 10;
+
+ if (Options["Ponder"])
+ optimumTime += optimumTime / 4;
}
-} // namespace Stockfish
+} // namespace Stockfish