X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftimeman.cpp;h=146818e6fde6efac0638ae87ee459e7adedb6f78;hb=d454cd42166d71789e8c5a4d099a0c3d96ab517e;hp=70d35929d77cd326386d4473401deb6505ed6269;hpb=c9b24c3358a26afdec5e33e369b6192039562971;p=stockfish
diff --git a/src/timeman.cpp b/src/timeman.cpp
index 70d35929..146818e6 100644
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, 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
@@ -17,9 +17,9 @@
along with this program. If not, see .
*/
+#include
#include
-#include "misc.h"
#include "search.h"
#include "timeman.h"
#include "ucioption.h"
@@ -29,8 +29,8 @@ namespace {
/// Constants
const int MoveHorizon = 50; // Plan time management at most this many moves ahead
- const float MaxRatio = 3.0f; // When in trouble, we can step over reserved time with this ratio
- const float StealRatio = 0.33f; // However we must not steal time from remaining moves over this ratio
+ 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
// MoveImportance[] is based on naive statistical analysis of "how many games are still undecided
@@ -64,7 +64,7 @@ namespace {
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 2, 2, 2, 2,
2, 1, 1, 1, 1, 1, 1, 1 };
- int move_importance(int ply) { return MoveImportance[Min(ply, 511)]; }
+ int move_importance(int ply) { return MoveImportance[std::min(ply, 511)]; }
/// Function Prototypes
@@ -72,18 +72,17 @@ namespace {
enum TimeType { OptimumTime, MaxTime };
template
- int remaining(int myTime, int movesToGo, int fullMoveNumber);
+ int remaining(int myTime, int movesToGo, int fullMoveNumber, int slowMover);
}
-void TimeManager::pv_instability(int curChanges, int prevChanges) {
+void TimeManager::pv_instability(double bestMoveChanges) {
- unstablePVExtraTime = curChanges * (optimumSearchTime / 2)
- + prevChanges * (optimumSearchTime / 3);
+ unstablePVExtraTime = int(bestMoveChanges * optimumSearchTime / 1.4);
}
-void TimeManager::init(const SearchLimits& limits, int fullMoveNumber)
+void TimeManager::init(const Search::LimitsType& limits, int currentPly, Color us)
{
/* We support four different kind of time controls:
@@ -103,60 +102,60 @@ void TimeManager::init(const SearchLimits& limits, int fullMoveNumber)
int hypMTG, hypMyTime, t1, t2;
// Read uci parameters
- int emergencyMoveHorizon = Options["Emergency Move Horizon"].value();
- int emergencyBaseTime = Options["Emergency Base Time"].value();
- int emergencyMoveTime = Options["Emergency Move Time"].value();
- int minThinkingTime = Options["Minimum Thinking Time"].value();
+ int emergencyMoveHorizon = Options["Emergency Move Horizon"];
+ int emergencyBaseTime = Options["Emergency Base Time"];
+ int emergencyMoveTime = Options["Emergency Move Time"];
+ int minThinkingTime = Options["Minimum Thinking Time"];
+ int slowMover = Options["Slow Mover"];
// Initialize to maximum values but unstablePVExtraTime that is reset
unstablePVExtraTime = 0;
- optimumSearchTime = maximumSearchTime = limits.time;
+ optimumSearchTime = maximumSearchTime = limits.time[us];
// We calculate optimum time usage for different hypothetic "moves to go"-values and choose the
// minimum of calculated search time values. Usually the greatest hypMTG gives the minimum values.
- for (hypMTG = 1; hypMTG <= (limits.movesToGo ? Min(limits.movesToGo, MoveHorizon) : MoveHorizon); hypMTG++)
+ for (hypMTG = 1; hypMTG <= (limits.movestogo ? std::min(limits.movestogo, MoveHorizon) : MoveHorizon); ++hypMTG)
{
// Calculate thinking time for hypothetic "moves to go"-value
- hypMyTime = limits.time
- + limits.increment * (hypMTG - 1)
+ hypMyTime = limits.time[us]
+ + limits.inc[us] * (hypMTG - 1)
- emergencyBaseTime
- - emergencyMoveTime * Min(hypMTG, emergencyMoveHorizon);
+ - emergencyMoveTime * std::min(hypMTG, emergencyMoveHorizon);
- hypMyTime = Max(hypMyTime, 0);
+ hypMyTime = std::max(hypMyTime, 0);
- t1 = minThinkingTime + remaining(hypMyTime, hypMTG, fullMoveNumber);
- t2 = minThinkingTime + remaining(hypMyTime, hypMTG, fullMoveNumber);
+ t1 = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly, slowMover);
+ t2 = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly, slowMover);
- optimumSearchTime = Min(optimumSearchTime, t1);
- maximumSearchTime = Min(maximumSearchTime, t2);
+ optimumSearchTime = std::min(optimumSearchTime, t1);
+ maximumSearchTime = std::min(maximumSearchTime, t2);
}
- if (Options["Ponder"].value())
+ if (Options["Ponder"])
optimumSearchTime += optimumSearchTime / 4;
// Make sure that maxSearchTime is not over absoluteMaxSearchTime
- optimumSearchTime = Min(optimumSearchTime, maximumSearchTime);
+ optimumSearchTime = std::min(optimumSearchTime, maximumSearchTime);
}
namespace {
template
- int remaining(int myTime, int movesToGo, int fullMoveNumber)
+ int remaining(int myTime, int movesToGo, int currentPly, int slowMover)
{
- const float TMaxRatio = (T == OptimumTime ? 1 : MaxRatio);
- const float TStealRatio = (T == OptimumTime ? 0 : StealRatio);
+ const double TMaxRatio = (T == OptimumTime ? 1 : MaxRatio);
+ const double TStealRatio = (T == OptimumTime ? 0 : StealRatio);
- int currentPly = 2 * fullMoveNumber;
- int thisMoveImportance = move_importance(currentPly);
+ double thisMoveImportance = double(move_importance(currentPly) * slowMover) / 100;
int otherMovesImportance = 0;
- for (int i = 1; i < movesToGo; i++)
+ for (int i = 1; i < movesToGo; ++i)
otherMovesImportance += move_importance(currentPly + 2 * i);
- float ratio1 = (TMaxRatio * thisMoveImportance) / float(TMaxRatio * thisMoveImportance + otherMovesImportance);
- float ratio2 = (thisMoveImportance + TStealRatio * otherMovesImportance) / float(thisMoveImportance + otherMovesImportance);
+ double ratio1 = (TMaxRatio * thisMoveImportance) / (TMaxRatio * thisMoveImportance + otherMovesImportance);
+ double ratio2 = (thisMoveImportance + TStealRatio * otherMovesImportance) / (thisMoveImportance + otherMovesImportance);
- return int(floor(myTime * Min(ratio1, ratio2)));
+ return int(floor(myTime * std::min(ratio1, ratio2)));
}
}