Further simplify aspiration code

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index a3bef714e090cb7970cdc88766006b8f8f2b7c69..02c209b1646fd4ab92469178a2127ffe30eb9787 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -17,67 +17,66 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(SEARCH_H_INCLUDED)
 #define SEARCH_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include "depth.h"
-#include "move.h"
-#include "value.h"
-
+#include <cstring>
+#include <vector>
 
-////
-//// Constants
-////
+#include "types.h"
 
-const int PLY_MAX = 100;
-const int PLY_MAX_PLUS_2 = 102;
-const int KILLER_MAX = 2;
+class Position;
+struct SplitPoint;
 
+namespace Search {
 
-////
-//// Types
-////
+/// 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.
 
-/// 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;
-
-struct SearchStack {
-  Move pv[PLY_MAX_PLUS_2];
+struct Stack {
+  SplitPoint* sp;
+  int ply;
   Move currentMove;
-  Move mateKiller;
-  Move threatMove;
   Move excludedMove;
   Move bestMove;
-  Move killers[KILLER_MAX];
+  Move killers[2];
   Depth reduction;
   Value eval;
-  bool skipNullMove;
+  Value evalMargin;
+  int skipNullMove;
+};
+
 
-  void init();
-  void initKillers();
+/// 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;
 };
 
 
-////
-//// Prototypes
-////
+/// 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_search();
-extern void init_threads();
-extern void exit_threads();
-extern bool think(const Position &pos, bool infinite, bool ponder, int side_to_move,
-                  int time[], int increment[], int movesToGo, int maxDepth,
-                  int maxNodes, int maxTime, Move searchMoves[]);
-extern int perft(Position &pos, Depth depth);
-extern int64_t nodes_searched();
+extern void init();
+extern int64_t perft(Position& pos, Depth depth);
+extern void think();
 
+} // namespace
 
 #endif // !defined(SEARCH_H_INCLUDED)