Further tweak accurate pv

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index a9f21fa2368febfdfcc37eaf71f9922ea85f0607..0c552d39f5058220350e233a0a155af8ad188296 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -38,6 +38,7 @@ namespace Search {
 
 struct Stack {
   SplitPoint* splitPoint;
+  Move* pv;
   int ply;
   Move currentMove;
   Move ttMove;
@@ -45,7 +46,7 @@ struct Stack {
   Move killers[2];
   Depth reduction;
   Value staticEval;
-  int skipNullMove;
+  bool skipNullMove;
 };
 
 
@@ -55,14 +56,11 @@ struct Stack {
 /// all non-pv moves.
 struct RootMove {
 
-  RootMove(Move m) : score(-VALUE_INFINITE), prevScore(-VALUE_INFINITE) {
-    pv.push_back(m); pv.push_back(MOVE_NONE);
-  }
+  RootMove(Move m) : score(-VALUE_INFINITE), prevScore(-VALUE_INFINITE), pv(1, m) {}
 
   bool operator<(const RootMove& m) const { return score > m.score; } // Ascending sort
   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;
@@ -78,13 +76,14 @@ struct RootMove {
 struct LimitsType {
 
   LimitsType() { // Using memset on a std::vector is undefined behavior
-    time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = movestogo =
-    depth = nodes = movetime = mate = infinite = ponder = 0;
+    nodes = time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = movestogo =
+    depth = movetime = mate = infinite = ponder = 0;
   }
   bool use_time_management() const { return !(mate | movetime | depth | nodes | infinite); }
 
   std::vector<Move> searchmoves;
-  int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder;
+  int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, movetime, mate, infinite, ponder;
+  int64_t nodes;
 };
 
 
@@ -101,13 +100,12 @@ extern volatile SignalsType Signals;
 extern LimitsType Limits;
 extern std::vector<RootMove> RootMoves;
 extern Position RootPos;
-extern Color RootColor;
 extern Time::point SearchTime;
 extern StateStackPtr SetupStates;
 
-extern void init();
-extern uint64_t perft(Position& pos, Depth depth);
-extern void think();
+void init();
+void think();
+template<bool Root> uint64_t perft(Position& pos, Depth depth);
 
 } // namespace Search