Move time related global variables under TimeManager

[stockfish] / src / timeman.cpp

diff --git a/src/timeman.cpp b/src/timeman.cpp
index c3d27dee1cee449d62865d8c62212027b8c144ac..046b3aaf70c769e03adcd7668445399eabeeebf7 100644 (file)
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -25,6 +25,7 @@
 #include <cmath>
 
 #include "misc.h"
+#include "timeman.h"
 #include "ucioption.h"
 
 ////
@@ -76,7 +77,7 @@ namespace {
 
   /// Function Prototypes
 
-  enum TimeType { MaxTime, AbsTime };
+  enum TimeType { OptimumTime, MaxTime };
 
   template<TimeType>
   int remaining(int myTime, int movesToGo, int currentPly);
@@ -87,8 +88,13 @@ namespace {
 //// Functions
 ////
 
-void get_search_times(int myTime, int myInc, int movesToGo, int currentPly,
-                      int* maxSearchTime, int* absoluteMaxSearchTime)
+void TimeManager::best_move_changes(int curIter, int prevIter) {
+
+    extraSearchTime =  curIter  * (optimumSearchTime / 2)
+                     + prevIter * (optimumSearchTime / 3);
+}
+
+void TimeManager::update(int myTime, int myInc, int movesToGo, int currentPly)
 {
   /* We support four different kind of time controls:
 
@@ -105,7 +111,7 @@ void get_search_times(int myTime, int myInc, int movesToGo, int currentPly,
       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");
@@ -114,7 +120,7 @@ void get_search_times(int myTime, int myInc, int movesToGo, int currentPly,
   int minThinkingTime      = get_option_value_int("Minimum Thinking Time");
 
   // Initialize variables to maximum values
-  *maxSearchTime = *absoluteMaxSearchTime = myTime;
+  optimumSearchTime = maximumSearchTime = myTime;
 
   // 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.
@@ -123,15 +129,18 @@ void get_search_times(int myTime, int myInc, int movesToGo, int currentPly,
       // Calculate thinking time for hypothetic "moves to go"-value
       hypMyTime = Max(myTime + (hypMTG - 1) * myInc - emergencyBaseTime - Min(hypMTG, emergencyMoveHorizon) * emergencyMoveTime, 0);
 
-      mTime = minThinkingTime + remaining<MaxTime>(hypMyTime, hypMTG, currentPly);
-      aTime = minThinkingTime + remaining<AbsTime>(hypMyTime, hypMTG, currentPly);
+      t1 = minThinkingTime + remaining<OptimumTime>(hypMyTime, hypMTG, currentPly);
+      t2 = minThinkingTime + remaining<MaxTime>(hypMyTime, hypMTG, currentPly);
 
-      *maxSearchTime = Min(*maxSearchTime, mTime);
-      *absoluteMaxSearchTime = Min(*absoluteMaxSearchTime, aTime);
+      optimumSearchTime = Min(optimumSearchTime, t1);
+      maximumSearchTime = Min(maximumSearchTime, t2);
   }
 
+  if (get_option_value_bool("Ponder"))
+      optimumSearchTime += optimumSearchTime / 4;
+
   // Make sure that maxSearchTime is not over absoluteMaxSearchTime
-  *maxSearchTime = Min(*maxSearchTime, *absoluteMaxSearchTime);
+  optimumSearchTime = Min(optimumSearchTime, maximumSearchTime);
 }
 
 ////
@@ -143,8 +152,8 @@ namespace {
   template<TimeType T>
   int remaining(int myTime, int movesToGo, int currentPly)
   {
-    const float TMaxRatio   = (T == MaxTime ? 1 : MaxRatio);
-    const float TStealRatio = (T == MaxTime ? 0 : StealRatio);
+    const float TMaxRatio   = (T == OptimumTime ? 1 : MaxRatio);
+    const float TStealRatio = (T == OptimumTime ? 0 : StealRatio);
 
     int thisMoveImportance = move_importance(currentPly);
     int otherMovesImportance = 0;