Stop earlier if iteration is taking too long

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 7075c3373a2c90eec8a021e45d8552544f529ab7..505e9ec2a481f49efa53e3276c14e2c6b15b1572 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -43,7 +43,7 @@ namespace Search {
   std::vector<RootMove> RootMoves;
   Position RootPos;
   Color RootColor;
-  Time::point SearchTime;
+  Time::point SearchTime, IterationTime;
   StateStackPtr SetupStates;
 }
 
@@ -396,6 +396,8 @@ namespace {
                 sync_cout << uci_pv(pos, depth, alpha, beta) << sync_endl;
         }
 
+        IterationTime = Time::now() - SearchTime;
+
         // If skill levels are enabled and time is up, pick a sub-optimal best move
         if (skill.enabled() && skill.time_to_pick(depth))
             skill.pick_move();
@@ -429,7 +431,7 @@ namespace {
             // Stop the search if most of the available time has been used. We
             // probably don't have enough time to search the first move at the
             // next iteration anyway.
-            if (Time::now() - SearchTime > (TimeMgr.available_time() * 62) / 100)
+            if (IterationTime > (TimeMgr.available_time() * 62) / 100)
                 stop = true;
 
             // Stop the search early if one move seems to be much better than others
@@ -1629,7 +1631,8 @@ void check_time() {
   Time::point elapsed = Time::now() - SearchTime;
   bool stillAtFirstMove =    Signals.firstRootMove
                          && !Signals.failedLowAtRoot
-                         &&  elapsed > TimeMgr.available_time();
+                         &&  elapsed > (TimeMgr.available_time() * 62) / 100
+                         &&  elapsed > IterationTime * 1.4;
 
   bool noMoreTime =   elapsed > TimeMgr.maximum_time() - 2 * TimerThread::Resolution
                    || stillAtFirstMove;