X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftimeman.cpp;h=f07f27e71b1e4a2e393294ef4532676867a3c5dc;hp=c3d27dee1cee449d62865d8c62212027b8c144ac;hb=1d368bbbdc50bbb4e10933c4986abc07a08010fd;hpb=cf0295f1ad2902badeaf9ccf6cb433314465595c

diff --git a/src/timeman.cpp b/src/timeman.cpp
index c3d27dee..f07f27e7 100644
--- a/src/timeman.cpp
+++ b/src/timeman.cpp
@@ -17,20 +17,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-////
-//// Includes
-////
-
 #include <cmath>
 
 #include "misc.h"
+#include "search.h"
+#include "timeman.h"
 #include "ucioption.h"
 
-////
-//// Local definitions
-////
-
 namespace {
 
   /// Constants
@@ -76,75 +69,83 @@ namespace {
 
   /// Function Prototypes
 
-  enum TimeType { MaxTime, AbsTime };
+  enum TimeType { OptimumTime, MaxTime };
 
   template<TimeType>
   int remaining(int myTime, int movesToGo, int currentPly);
 }
 
 
-////
-//// Functions
-////
+void TimeManager::pv_instability(int curChanges, int prevChanges) {
+
+    unstablePVExtraTime =  curChanges  * (optimumSearchTime / 2)
+                         + prevChanges * (optimumSearchTime / 3);
+}
+
 
-void get_search_times(int myTime, int myInc, int movesToGo, int currentPly,
-                      int* maxSearchTime, int* absoluteMaxSearchTime)
+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>();
+  int emergencyBaseTime    = Options["Emergency Base Time"].value<int>();
+  int emergencyMoveTime    = Options["Emergency Move Time"].value<int>();
+  int minThinkingTime      = Options["Minimum Thinking Time"].value<int>();
 
-  // Initialize variables to maximum values
-  *maxSearchTime = *absoluteMaxSearchTime = 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);
 
-      mTime = minThinkingTime + remaining<MaxTime>(hypMyTime, hypMTG, currentPly);
-      aTime = minThinkingTime + remaining<AbsTime>(hypMyTime, hypMTG, currentPly);
+      hypMyTime = Max(hypMyTime, 0);
 
-      *maxSearchTime = Min(*maxSearchTime, mTime);
-      *absoluteMaxSearchTime = Min(*absoluteMaxSearchTime, aTime);
+      t1 = minThinkingTime + remaining<OptimumTime>(hypMyTime, hypMTG, currentPly);
+      t2 = minThinkingTime + remaining<MaxTime>(hypMyTime, hypMTG, currentPly);
+
+      optimumSearchTime = Min(optimumSearchTime, t1);
+      maximumSearchTime = Min(maximumSearchTime, t2);
   }
 
+  if (Options["Ponder"].value<bool>())
+      optimumSearchTime += optimumSearchTime / 4;
+
   // Make sure that maxSearchTime is not over absoluteMaxSearchTime
-  *maxSearchTime = Min(*maxSearchTime, *absoluteMaxSearchTime);
+  optimumSearchTime = Min(optimumSearchTime, maximumSearchTime);
 }
 
-////
-//// Local functions
-////
 
 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;