100% accurate PV display

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index b8858527515736f06dac88baa1676167d42339f3..afa12b3a4ee6b56104918178aeee4bdd50e6845a 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -1,7 +1,7 @@
 /*
   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-2014 Marco Costalba, Joona Kiiski, 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
@@ -20,7 +20,6 @@
 #ifndef SEARCH_H_INCLUDED
 #define SEARCH_H_INCLUDED
 
-#include <cstring>
 #include <memory>
 #include <stack>
 #include <vector>
@@ -33,19 +32,34 @@ struct SplitPoint;
 
 namespace Search {
 
+struct PVEntry {
+  Move pv[MAX_PLY+1];
+
+  void update(Move move, PVEntry* child) {
+      pv[0] = move;
+
+      int i = 1;
+      for (; child && i < MAX_PLY && child->pv[i - 1] != MOVE_NONE; ++i)
+          pv[i] = child->pv[i - 1];
+      pv[i] = MOVE_NONE;
+  } 
+};
+
 /// The Stack struct keeps track of the information we need to remember from
 /// nodes shallower and deeper in the tree during the search. Each search thread
 /// has its own array of Stack objects, indexed by the current ply.
 
 struct Stack {
   SplitPoint* splitPoint;
+  PVEntry* pv;
   int ply;
   Move currentMove;
+  Move ttMove;
   Move excludedMove;
   Move killers[2];
   Depth reduction;
   Value staticEval;
-  int skipNullMove;
+  bool skipNullMove;
 };
 
 
@@ -62,7 +76,6 @@ struct RootMove {
   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;
@@ -77,10 +90,15 @@ struct RootMove {
 
 struct LimitsType {
 
-  LimitsType() { std::memset(this, 0, sizeof(LimitsType)); }
+  LimitsType() { // Using memset on a std::vector is undefined behavior
+    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); }
 
-  int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder;
+  std::vector<Move> searchmoves;
+  int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, movetime, mate, infinite, ponder;
+  int64_t nodes;
 };
 
 
@@ -88,7 +106,7 @@ struct LimitsType {
 /// typically in an async fashion e.g. to stop the search by the GUI.
 
 struct SignalsType {
-  bool stopOnPonderhit, firstRootMove, stop, failedLowAtRoot;
+  bool stop, stopOnPonderhit, firstRootMove, failedLowAtRoot;
 };
 
 typedef std::auto_ptr<std::stack<StateInfo> > StateStackPtr;
@@ -97,13 +115,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 size_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