X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Ftimeman.h;h=0da083dc6bd9b8c68ebee2cfa25c7521bfbaa380;hp=484513bb18c5265530e5ccae2267e962dffcd6e4;hb=dcd8ce70941e9b8d5180eb43865bb9819e424c19;hpb=9a1d5f0f1d8a12a85b198688d4f1d636a146eb7a

diff --git a/src/timeman.h b/src/timeman.h
index 484513bb..0da083dc 100644
--- a/src/timeman.h
+++ b/src/timeman.h
@@ -1,7 +1,8 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,23 +18,33 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(TIMEMAN_H_INCLUDED)
+#ifndef TIMEMAN_H_INCLUDED
 #define TIMEMAN_H_INCLUDED
 
-/// The TimeManager class computes the optimal time to think depending on the
-/// maximum available time, the move game number and other parameters.
+#include "misc.h"
+#include "search.h"
+#include "thread.h"
 
-class TimeManager {
+/// 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(const Search::LimitsType& limits, int currentPly, Color us);
-  void pv_instability(int curChanges, int prevChanges);
-  int available_time() const { return optimumSearchTime + unstablePVExtraTime; }
-  int maximum_time() const { return maximumSearchTime; }
+  void init(Search::LimitsType& limits, Color us, int ply);
+  void pv_instability(double bestMoveChanges) { unstablePvFactor = 1 + bestMoveChanges; }
+  int available() const { return int(optimumTime * unstablePvFactor * 1.01); }
+  int maximum() const { return maximumTime; }
+  int elapsed() const { return int(Search::Limits.npmsec ? Threads.nodes_searched() : now() - startTime); }
+
+  int64_t availableNodes; // When in 'nodes as time' mode
 
 private:
-  int optimumSearchTime;
-  int maximumSearchTime;
-  int unstablePVExtraTime;
+  TimePoint startTime;
+  int optimumTime;
+  int maximumTime;
+  double unstablePvFactor;
 };
 
-#endif // !defined(TIMEMAN_H_INCLUDED)
+extern TimeManagement Time;
+
+#endif // #ifndef TIMEMAN_H_INCLUDED