Further simplify aspiration code

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index b179c9c77006e030813eaa15c2883406601387a2..02c209b1646fd4ab92469178a2127ffe30eb9787 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -21,53 +21,62 @@
 #define SEARCH_H_INCLUDED
 
 #include <cstring>
+#include <vector>
 
-#include "move.h"
 #include "types.h"
 
 class Position;
 struct SplitPoint;
 
-/// 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.
+namespace Search {
 
-struct SearchStack {
+/// 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;
 };
 
 
-/// The SearchLimits struct stores information sent by GUI about available time
+/// 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 SearchLimits {
+struct LimitsType {
 
-  SearchLimits() { memset(this, 0, sizeof(SearchLimits)); }
+  LimitsType() {  memset(this, 0, sizeof(LimitsType)); }
+  bool useTimeManagement() const { return !(maxTime | maxDepth | maxNodes | infinite); }
 
-  SearchLimits(int t, int i, int mtg, int mt, int md, int mn, bool inf, bool pon)
-              : time(t), increment(i), movesToGo(mtg), maxTime(mt), maxDepth(md),
-                maxNodes(mn), infinite(inf), ponder(pon) {}
+  int time, increment, movesToGo, maxTime, maxDepth, maxNodes, infinite, ponder;
+};
 
-  bool useTimeManagement() const { return !(maxTime | maxDepth | maxNodes | int(infinite)); }
 
-  int time, increment, movesToGo, maxTime, maxDepth, maxNodes;
-  bool 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 void init_search();
+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, const SearchLimits& limits, Move searchMoves[]);
+extern void think();
+
+} // namespace
 
 #endif // !defined(SEARCH_H_INCLUDED)