Use a set to store SearchMoves

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index 831248bacc8ee05cb197bd5841d45b3ebe89c660..d805d4629424cf9a991ee1b06d8eb979d0dbdcc3 100644 (file)
--- a/src/search.h
+++ b/src/search.h
@@ -1,90 +1,82 @@
 /*
-  Glaurung, a UCI chess playing engine.
-  Copyright (C) 2004-2008 Tord Romstad
+  Stockfish, a UCI chess playing engine derived from Glaurung 2.1
+  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
 
-  Glaurung is free software: you can redistribute it and/or modify
+  Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
-  Glaurung is distributed in the hope that it will be useful,
+
+  Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(SEARCH_H_INCLUDED)
 #define SEARCH_H_INCLUDED
 
-////
-//// Includes
-////
+#include <cstring>
+#include <set>
 
 #include "types.h"
-#include "depth.h"
-#include "history.h"
-#include "lock.h"
-#include "movegen.h"
-#include "position.h"
-#include "tt.h"
-#include "value.h"
-
-
-////
-//// Constants
-////
 
-const int PLY_MAX = 100;
-const int PLY_MAX_PLUS_2 = 102;
+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 SearchStack {
-  Move pv[PLY_MAX];
+struct Stack {
+  SplitPoint* sp;
+  int ply;
   Move currentMove;
-  Value currentMoveCaptureValue;
-  Move mateKiller, killer1, killer2;
-  Move threatMove;
+  Move excludedMove;
+  Move bestMove;
+  Move killers[2];
   Depth reduction;
+  Value eval;
+  Value evalMargin;
+  int skipNullMove;
 };
 
 
-////
-//// Global variables
-////
+/// 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 {
 
-extern TranspositionTable TT;
+  LimitsType() {  memset(this, 0, sizeof(LimitsType)); }
+  bool use_time_management() const { return !(maxTime | maxDepth | maxNodes | infinite); }
 
-extern int ActiveThreads;
+  int time, increment, movesToGo, maxTime, maxDepth, maxNodes, infinite, ponder;
+};
 
-extern Lock SMPLock;
 
-// Perhaps better to make H local, and pass as parameter to MovePicker?
-extern History H;  
+/// 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;
+};
 
-////
-//// Prototypes
-////
+extern volatile SignalsType Signals;
+extern LimitsType Limits;
+extern std::set<Move> SearchMoves;
+extern Position RootPosition;
 
-extern void init_threads();
-extern void stop_threads();
-extern void think(const Position &pos, bool infinite, bool ponder, int time,
-                  int increment, int movesToGo, int maxDepth, int maxNodes,
-                  int maxTime, Move searchMoves[]);
-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)