X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=c573807b41bd01c1d9c28cf79464b94570e317da;hp=c1b370d63070018c0d64feb99a6d48714945d306;hb=6becc8144686b9a40d8dc9d5e0ce4dec28cbcb6a;hpb=8307da0de77c9c7bbf7c56a7d9c8a688ff4dfb4e

diff --git a/src/search.h b/src/search.h
index c1b370d6..c573807b 100644
--- a/src/search.h
+++ b/src/search.h
@@ -23,6 +23,7 @@
 #include <cstring>
 #include <vector>
 
+#include "misc.h"
 #include "types.h"
 
 class Position;
@@ -39,7 +40,6 @@ struct Stack {
   int ply;
   Move currentMove;
   Move excludedMove;
-  Move bestMove;
   Move killers[2];
   Depth reduction;
   Value eval;
@@ -48,16 +48,39 @@ struct Stack {
 };
 
 
+/// RootMove struct is used for moves at the root of the tree. For each root
+/// move we store a score, a node count, and a PV (really a refutation in the
+/// case of moves which fail low). Score is normally set at -VALUE_INFINITE for
+/// all non-pv moves.
+struct RootMove {
+
+  RootMove(){} // Needed by sort()
+  RootMove(Move m) : score(-VALUE_INFINITE), prevScore(-VALUE_INFINITE) {
+    pv.push_back(m); pv.push_back(MOVE_NONE);
+  }
+
+  bool operator<(const RootMove& m) const { return score < m.score; }
+  bool operator==(const Move& m) const { return pv[0] == m; }
+
+  void extract_pv_from_tt(Position& pos);
+  void insert_pv_in_tt(Position& pos);
+
+  Value score;
+  Value prevScore;
+  std::vector<Move> pv;
+};
+
+
 /// The LimitsType struct stores information sent by GUI about available time
 /// to search the current move, maximum depth/time, if we are in analysis mode
 /// or if we have to ponder while is our opponent's side to move.
 
 struct LimitsType {
 
-  LimitsType() {  memset(this, 0, sizeof(LimitsType)); }
-  bool useTimeManagement() const { return !(maxTime | maxDepth | maxNodes | infinite); }
+  LimitsType() { memset(this, 0, sizeof(LimitsType)); }
+  bool use_time_management() const { return !(movetime | depth | nodes | infinite); }
 
-  int time, increment, movesToGo, maxTime, maxDepth, maxNodes, infinite, ponder;
+  int time[2], inc[2], movestogo, depth, nodes, movetime, infinite, ponder;
 };
 
 
@@ -70,13 +93,14 @@ struct SignalsType {
 
 extern volatile SignalsType Signals;
 extern LimitsType Limits;
-extern std::vector<Move> SearchMoves;
+extern std::vector<RootMove> RootMoves;
 extern Position RootPosition;
+extern Time SearchTime;
 
 extern void init();
 extern int64_t perft(Position& pos, Depth depth);
 extern void think();
 
-} // namespace
+} // namespace Search
 
 #endif // !defined(SEARCH_H_INCLUDED)