X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftimeman.cpp;h=e29d4e467fec7a9f3f4f8e34983b9d210e323959;hb=25b4d0c127af9fe564f7a797460bed4c2837bcc2;hp=fb817e56d5ddfd8f1345b87e36855bb0712f2936;hpb=dda53e831d369c5d02ccdebed1a2dcc781fc11c0;p=stockfish
diff --git a/src/timeman.cpp b/src/timeman.cpp
index fb817e56..e29d4e46 100644
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -17,21 +17,13 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
#include
#include "misc.h"
+#include "search.h"
#include "timeman.h"
#include "ucioption.h"
-////
-//// Local definitions
-////
-
namespace {
/// Constants
@@ -80,67 +72,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::update(int myTime, int myInc, int movesToGo, int currentPly,
- int* optimumSearchTime, int* maximumSearchTime)
+ unstablePVExtraTime = curChanges * (optimumSearchTime / 2)
+ + prevChanges * (optimumSearchTime / 3);
+}
+
+
+void TimeManager::init(const SearchLimits& 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, mTime, aTime;
+ 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 ? 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 * Min(hypMTG, emergencyMoveHorizon);
+
+ hypMyTime = Max(hypMyTime, 0);
- mTime = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly);
- aTime = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly);
+ t1 = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly);
+ t2 = minThinkingTime + remaining(hypMyTime, hypMTG, currentPly);
- *optimumSearchTime = Min(*optimumSearchTime, mTime);
- *maximumSearchTime = Min(*maximumSearchTime, aTime);
+ optimumSearchTime = Min(optimumSearchTime, t1);
+ maximumSearchTime = Min(maximumSearchTime, t2);
}
- if (get_option_value_bool("Ponder"))
- *optimumSearchTime += *optimumSearchTime / 4;
+ if (Options["Ponder"].value())
+ optimumSearchTime += optimumSearchTime / 4;
// Make sure that maxSearchTime is not over absoluteMaxSearchTime
- *optimumSearchTime = Min(*optimumSearchTime, *maximumSearchTime);
+ optimumSearchTime = Min(optimumSearchTime, maximumSearchTime);
}
-////
-//// Local functions
-////
namespace {