X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=d805d4629424cf9a991ee1b06d8eb979d0dbdcc3;hp=a2e783b110895a6fb92fa71665c4f9edc0cc9820;hb=9da3b44ddc7bc9ea7094b91663cbc0f8319c46be;hpb=1d368bbbdc50bbb4e10933c4986abc07a08010fd

diff --git a/src/search.h b/src/search.h
index a2e783b1..ba8a9053 100644
--- a/src/search.h
+++ b/src/search.h
@@ -1,7 +1,8 @@
 /*
   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-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, 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,55 +18,93 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(SEARCH_H_INCLUDED)
+#ifndef SEARCH_H_INCLUDED
 #define SEARCH_H_INCLUDED
 
-#include "move.h"
+#include <atomic>
+#include <vector>
+
+#include "misc.h"
+#include "movepick.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 {
+
+/// 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 {
+  Move* pv;
+  CounterMoveStats* counterMoves;
   int ply;
   Move currentMove;
-  Move mateKiller;
   Move excludedMove;
-  Move bestMove;
   Move killers[2];
-  Depth reduction;
-  Value eval;
-  Value evalMargin;
-  bool skipNullMove;
-  SplitPoint* sp;
+  Value staticEval;
+  int history;
+  int moveCount;
+};
+
+
+/// RootMove struct is used for moves at the root of the tree. For each root move
+/// we store a score and a PV (really a refutation in the case of moves which
+/// fail low). Score is normally set at -VALUE_INFINITE for all non-pv moves.
+
+struct RootMove {
+
+  explicit RootMove(Move m) : pv(1, m) {}
+
+  bool operator<(const RootMove& m) const { return m.score < score; } // Descending sort
+  bool operator==(const Move& m) const { return pv[0] == m; }
+  bool extract_ponder_from_tt(Position& pos);
+
+  Value score = -VALUE_INFINITE;
+  Value previousScore = -VALUE_INFINITE;
+  std::vector<Move> pv;
 };
 
+typedef std::vector<RootMove> RootMoves;
+
+
+/// 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 it's our opponent's turn to move.
+
+struct LimitsType {
 
-/// The SearchLimits 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.
+  LimitsType() { // Init explicitly due to broken value-initialization of non POD in MSVC
+    nodes = time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] =
+    npmsec = movestogo = depth = movetime = mate = infinite = ponder = 0;
+  }
 
-struct SearchLimits {
+  bool use_time_management() const {
+    return !(mate | movetime | depth | nodes | infinite);
+  }
+
+  std::vector<Move> searchmoves;
+  int time[COLOR_NB], inc[COLOR_NB], npmsec, movestogo, depth, movetime, mate, infinite, ponder;
+  int64_t nodes;
+  TimePoint startTime;
+};
 
-  SearchLimits() {}
-  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) {}
 
-  bool useTimeManagement() const { return !(maxTime | maxDepth | maxNodes | int(infinite)); }
+/// SignalsType struct stores atomic flags updated during the search, typically
+/// in an async fashion e.g. to stop the search by the GUI.
 
-  int time, increment, movesToGo, maxTime, maxDepth, maxNodes;
-  bool infinite, ponder;
+struct SignalsType {
+  std::atomic_bool stop, stopOnPonderhit;
 };
 
-extern void init_threads();
-extern void exit_threads();
-extern int64_t perft(Position& pos, Depth depth);
-extern bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]);
+extern SignalsType Signals;
+extern LimitsType Limits;
+
+void init();
+void clear();
+template<bool Root = true> uint64_t perft(Position& pos, Depth depth);
+
+} // namespace Search
 
-#endif // !defined(SEARCH_H_INCLUDED)
+#endif // #ifndef SEARCH_H_INCLUDED