X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftimeman.cpp;h=8282f2c629a384f1cbfd9fe21f937ad05605fc16;hb=a44c5cf4f77b05a03;hp=046b3aaf70c769e03adcd7668445399eabeeebf7;hpb=c295599e4ad481f677b14cb0be14174b61ebff81;p=stockfish
diff --git a/src/timeman.cpp b/src/timeman.cpp
index 046b3aaf..8282f2c6 100644
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -17,21 +17,14 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
+#include
#include "misc.h"
+#include "search.h"
#include "timeman.h"
#include "ucioption.h"
-////
-//// Local definitions
-////
-
namespace {
/// Constants
@@ -72,7 +65,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
@@ -80,72 +73,72 @@ namespace {
enum TimeType { OptimumTime, MaxTime };
template
- int remaining(int myTime, int movesToGo, int currentPly);
+ int remaining(int myTime, int movesToGo, int fullMoveNumber);
}
-////
-//// Functions
-////
+void TimeManager::pv_instability(int curChanges, int prevChanges) {
-void TimeManager::best_move_changes(int curIter, int prevIter) {
-
- extraSearchTime = curIter * (optimumSearchTime / 2)
- + prevIter * (optimumSearchTime / 3);
+ unstablePVExtraTime = curChanges * (optimumSearchTime / 2)
+ + prevChanges * (optimumSearchTime / 3);
}
-void TimeManager::update(int myTime, int myInc, int movesToGo, int currentPly)
+
+void TimeManager::init(const Search::LimitsType& limits, int currentPly)
{
/* We support four different kind of time controls:
- Inc == 0 && movesToGo == 0 means: x basetime [sudden death!]
- Inc == 0 && movesToGo != 0 means: (x moves) / (y minutes)
- Inc > 0 && movesToGo == 0 means: x basetime + z inc.
- Inc > 0 && movesToGo != 0 means: (x moves) / (y minutes) + z inc
+ increment == 0 && movesToGo == 0 means: x basetime [sudden death!]
+ increment == 0 && movesToGo != 0 means: x moves in y minutes
+ increment > 0 && movesToGo == 0 means: x basetime + z increment
+ increment > 0 && movesToGo != 0 means: x moves in y minutes + z increment
Time management is adjusted by following UCI parameters:
- emergencyMoveHorizon :Be prepared to always play at least this many moves
- emergencyBaseTime :Always attempt to keep at least this much time (in ms) at clock
- emergencyMoveTime :Plus attempt to keep at least this much time for each remaining emergency move
- minThinkingTime :No matter what, use at least this much thinking before doing the move
+ emergencyMoveHorizon: Be prepared to always play at least this many moves
+ emergencyBaseTime : Always attempt to keep at least this much time (in ms) at clock
+ emergencyMoveTime : Plus attempt to keep at least this much time for each remaining emergency move
+ minThinkingTime : No matter what, use at least this much thinking before doing the move
*/
int hypMTG, hypMyTime, t1, t2;
// Read uci parameters
- int emergencyMoveHorizon = get_option_value_int("Emergency Move Horizon");
- int emergencyBaseTime = get_option_value_int("Emergency Base Time");
- int emergencyMoveTime = get_option_value_int("Emergency Move Time");
- int minThinkingTime = get_option_value_int("Minimum Thinking Time");
+ 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();
- // Initialize variables to maximum values
- optimumSearchTime = maximumSearchTime = myTime;
+ // Initialize to maximum values but unstablePVExtraTime that is reset
+ unstablePVExtraTime = 0;
+ optimumSearchTime = maximumSearchTime = limits.time;
// 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 <= (movesToGo ? Min(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 = Max(myTime + (hypMTG - 1) * myInc - emergencyBaseTime - Min(hypMTG, emergencyMoveHorizon) * emergencyMoveTime, 0);
+ hypMyTime = limits.time
+ + limits.increment * (hypMTG - 1)
+ - emergencyBaseTime
+ - emergencyMoveTime * std::min(hypMTG, emergencyMoveHorizon);
+
+ hypMyTime = std::max(hypMyTime, 0);
t1 = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly);
t2 = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly);
- optimumSearchTime = Min(optimumSearchTime, t1);
- maximumSearchTime = Min(maximumSearchTime, t2);
+ optimumSearchTime = std::min(optimumSearchTime, t1);
+ maximumSearchTime = std::min(maximumSearchTime, t2);
}
- if (get_option_value_bool("Ponder"))
+ if (Options["Ponder"].value())
optimumSearchTime += optimumSearchTime / 4;
// Make sure that maxSearchTime is not over absoluteMaxSearchTime
- optimumSearchTime = Min(optimumSearchTime, maximumSearchTime);
+ optimumSearchTime = std::min(optimumSearchTime, maximumSearchTime);
}
-////
-//// Local functions
-////
namespace {
@@ -164,6 +157,6 @@ namespace {
float ratio1 = (TMaxRatio * thisMoveImportance) / float(TMaxRatio * thisMoveImportance + otherMovesImportance);
float ratio2 = (thisMoveImportance + TStealRatio * otherMovesImportance) / float(thisMoveImportance + otherMovesImportance);
- return int(floor(myTime * Min(ratio1, ratio2)));
+ return int(floor(myTime * std::min(ratio1, ratio2)));
}
}