Use a set to store SearchMoves

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index e2e76000793c6f890d569e6c769b680901053da5..d805d4629424cf9a991ee1b06d8eb979d0dbdcc3 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2012 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
@@ -17,62 +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"
-
-
-////
-//// Constants
-////
+#include <cstring>
+#include <set>
 
-const int PLY_MAX = 100;
-const int PLY_MAX_PLUS_2 = 102;
+#include "types.h"
 
+class Position;
+struct SplitPoint;
 
-////
-//// Types
-////
+namespace Search {
 
-/// 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;
+/// 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 SearchStack {
+struct Stack {
+  SplitPoint* sp;
+  int ply;
   Move currentMove;
-  Move mateKiller;
   Move excludedMove;
   Move bestMove;
   Move killers[2];
   Depth reduction;
   Value eval;
-  bool skipNullMove;
+  Value evalMargin;
+  int skipNullMove;
+};
+
+
+/// 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 use_time_management() 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.
 
-  void init();
-  void initKillers();
+struct SignalsType {
+  bool stopOnPonderhit, firstRootMove, stop, failedLowAtRoot;
 };
 
+extern volatile SignalsType Signals;
+extern LimitsType Limits;
+extern std::set<Move> SearchMoves;
+extern Position RootPosition;
 
-////
-//// Prototypes
-////
+extern void init();
+extern int64_t perft(Position& pos, Depth depth);
+extern void think();
 
-extern void init_search();
-extern void init_threads();
-extern void exit_threads();
-extern int perft(Position& pos, Depth depth);
-extern int64_t nodes_searched();
-extern bool think(const Position& pos, bool infinite, bool ponder, int time[], int increment[],
-                  int movesToGo, int maxDepth, int maxNodes, int maxTime, Move searchMoves[]);
+} // namespace
 
 #endif // !defined(SEARCH_H_INCLUDED)