Simplify time management and fix 'ponder on' bug

[stockfish] / src / timeman.h

diff --git a/src/timeman.h b/src/timeman.h
index 1333767f6ceff7268dea48b8d28f700514167bf0..3faba00d292498f0b1875b40d6051b455084a9c0 100644 (file)
--- a/src/timeman.h
+++ b/src/timeman.h
@@ -22,22 +22,23 @@
 
 #include "misc.h"
 #include "search.h"
+#include "thread.h"
 
 /// The TimeManagement class computes the optimal time to think depending on
 /// the maximum available time, the game move number and other parameters.
 
 class TimeManagement {
 public:
-  void init(Search::LimitsType& limits, Color us, int ply, TimePoint now);
+  void init(Search::LimitsType& limits, Color us, int ply);
   void pv_instability(double bestMoveChanges) { unstablePvFactor = 1 + bestMoveChanges; }
-  int available() const { return int(optimumTime * unstablePvFactor * 0.76); }
+  int available() const { return int(optimumTime * unstablePvFactor * 1.016); }
   int maximum() const { return maximumTime; }
-  int elapsed() const { return Search::Limits.npmsec ? Search::RootPos.nodes_searched() : now() - start; }
+  int elapsed() const { return int(Search::Limits.npmsec ? Threads.nodes_searched() : now() - startTime); }
 
   int64_t availableNodes; // When in 'nodes as time' mode
 
 private:
-  TimePoint start;
+  TimePoint startTime;
   int optimumTime;
   int maximumTime;
   double unstablePvFactor;