X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsearch.h;h=599d058fa7d018454ea481f30a6448f079a53e87;hb=b96dd754ede60b8463606cf38eac3eab400a123d;hp=02c209b1646fd4ab92469178a2127ffe30eb9787;hpb=4e59c5c2746741e7aedd451ea16b792d1568e5c4;p=stockfish
diff --git a/src/search.h b/src/search.h
index 02c209b1..599d058f 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-2016 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,66 +18,91 @@
along with this program. If not, see .
*/
-#if !defined(SEARCH_H_INCLUDED)
+#ifndef SEARCH_H_INCLUDED
#define SEARCH_H_INCLUDED
-#include
+#include
#include
+#include "misc.h"
+#include "position.h"
#include "types.h"
-class Position;
-struct SplitPoint;
+template struct Stats;
+typedef Stats CounterMoveStats;
namespace Search {
-/// 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.
+/// 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;
+ Move* pv;
int ply;
Move currentMove;
Move excludedMove;
- Move bestMove;
Move killers[2];
- Depth reduction;
- Value eval;
- Value evalMargin;
- int skipNullMove;
+ Value staticEval;
+ bool skipEarlyPruning;
+ int moveCount;
+ CounterMoveStats* counterMoves;
};
+/// 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.
-/// 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 RootMove {
-struct LimitsType {
+ explicit RootMove(Move m) : pv(1, m) {}
- LimitsType() { memset(this, 0, sizeof(LimitsType)); }
- bool useTimeManagement() const { return !(maxTime | maxDepth | maxNodes | infinite); }
+ 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);
- int time, increment, movesToGo, maxTime, maxDepth, maxNodes, infinite, ponder;
+ Value score = -VALUE_INFINITE;
+ Value previousScore = -VALUE_INFINITE;
+ std::vector pv;
};
+typedef std::vector 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 {
+
+ 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;
+ }
+
+ bool use_time_management() const {
+ return !(mate | movetime | depth | nodes | infinite);
+ }
+
+ std::vector searchmoves;
+ int time[COLOR_NB], inc[COLOR_NB], npmsec, movestogo, depth, movetime, mate, infinite, ponder;
+ int64_t nodes;
+ TimePoint startTime;
+};
-/// The SignalsType struct stores volatile flags updated during the search
-/// typically in an async fashion, for instance to stop the search by the GUI.
+/// The SignalsType struct stores atomic flags updated during the search
+/// typically in an async fashion e.g. to stop the search by the GUI.
struct SignalsType {
- bool stopOnPonderhit, firstRootMove, stop, failedLowAtRoot;
+ std::atomic_bool stop, stopOnPonderhit;
};
-extern volatile SignalsType Signals;
+extern SignalsType Signals;
extern LimitsType Limits;
-extern std::vector SearchMoves;
-extern Position RootPosition;
-extern void init();
-extern int64_t perft(Position& pos, Depth depth);
-extern void think();
+void init();
+void clear();
+template uint64_t perft(Position& pos, Depth depth);
-} // namespace
+} // namespace Search
-#endif // !defined(SEARCH_H_INCLUDED)
+#endif // #ifndef SEARCH_H_INCLUDED