X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsearch.h;h=599d058fa7d018454ea481f30a6448f079a53e87;hb=7396c08b795191d954528d687e84d7ff6dbe7a3b;hp=03fa5c640373f73affd8a41818ade11606da5845;hpb=70b1b79264b2a160f72dd2aa92c2f80045e4cd83;p=stockfish
diff --git a/src/search.h b/src/search.h
index 03fa5c64..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-2012 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,96 +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
#include
#include "misc.h"
#include "position.h"
#include "types.h"
-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 killers[2];
- Depth reduction;
Value staticEval;
- Value evalMargin;
- int skipNullMove;
+ 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.
-/// RootMove struct is used for moves at the root of the tree. For each root
-/// move we store a score, a node count, 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 {
- RootMove(){} // Needed by sort()
- RootMove(Move m) : score(-VALUE_INFINITE), prevScore(-VALUE_INFINITE) {
- pv.push_back(m); pv.push_back(MOVE_NONE);
- }
+ explicit RootMove(Move m) : pv(1, m) {}
- bool operator<(const RootMove& m) const { return score < m.score; }
+ 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);
- void extract_pv_from_tt(Position& pos);
- void insert_pv_in_tt(Position& pos);
-
- Value score;
- Value prevScore;
+ Value score = -VALUE_INFINITE;
+ Value previousScore = -VALUE_INFINITE;
std::vector pv;
};
+typedef std::vector RootMoves;
-/// 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.
+/// 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() { memset(this, 0, sizeof(LimitsType)); }
- bool use_time_management() const { return !(movetime | depth | nodes | infinite); }
+ 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;
+ }
- int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, infinite, ponder;
-};
+ 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;
};
-typedef std::auto_ptr > StateStackPtr;
-
-extern volatile SignalsType Signals;
+extern SignalsType Signals;
extern LimitsType Limits;
-extern std::vector RootMoves;
-extern Position RootPosition;
-extern Color RootColor;
-extern Time::point SearchTime;
-extern StateStackPtr SetupStates;
-extern void init();
-extern size_t perft(Position& pos, Depth depth);
-extern void think();
+void init();
+void clear();
+template uint64_t perft(Position& pos, Depth depth);
} // namespace Search
-#endif // !defined(SEARCH_H_INCLUDED)
+#endif // #ifndef SEARCH_H_INCLUDED