Further simplify aspiration code

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index 1b17254a84b70362230c493db08f3a9ab315f106..02c209b1646fd4ab92469178a2127ffe30eb9787 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -20,37 +20,63 @@
 #if !defined(SEARCH_H_INCLUDED)
 #define SEARCH_H_INCLUDED
 
-#include "move.h"
-#include "types.h"
+#include <cstring>
+#include <vector>
 
+#include "types.h"
 
-/// The SearchStack 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 SearchStack objects, indexed by the
-/// current ply.
-struct EvalInfo;
+class Position;
 struct SplitPoint;
 
-struct SearchStack {
+namespace Search {
+
+/// 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* sp;
+  int ply;
   Move currentMove;
-  Move mateKiller;
   Move excludedMove;
   Move bestMove;
   Move killers[2];
   Depth reduction;
   Value eval;
   Value evalMargin;
-  bool skipNullMove;
-  SplitPoint* sp;
+  int skipNullMove;
 };
 
-class Position;
 
-extern void init_search();
-extern void init_threads();
-extern void exit_threads();
+/// 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); }
+
+  int time, increment, movesToGo, maxTime, maxDepth, maxNodes, infinite, ponder;
+};
+
+
+/// The SignalsType struct stores volatile flags updated during the search
+/// typically in an async fashion, for instance to stop the search by the GUI.
+
+struct SignalsType {
+  bool stopOnPonderhit, firstRootMove, stop, failedLowAtRoot;
+};
+
+extern volatile SignalsType Signals;
+extern LimitsType Limits;
+extern std::vector<Move> SearchMoves;
+extern Position RootPosition;
+
+extern void init();
 extern int64_t perft(Position& pos, Depth depth);
-extern bool think(Position& pos, bool infinite, bool ponder, int time[], int increment[],
-                  int movesToGo, int maxDepth, int maxNodes, int maxTime, Move searchMoves[]);
+extern void think();
+
+} // namespace
 
 #endif // !defined(SEARCH_H_INCLUDED)