X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsearch.h;h=afa12b3a4ee6b56104918178aeee4bdd50e6845a;hb=99f2c1a2a64cac94ee56324fa25f8fba04cd1347;hp=5c2dfc8ac422b47777dca33164ea6ad6e7887d41;hpb=7f56d2949d4244c9d2e6796adc721582e9d85804;p=stockfish diff --git a/src/search.h b/src/search.h index 5c2dfc8a..afa12b3a 100644 --- a/src/search.h +++ b/src/search.h @@ -32,12 +32,26 @@ struct SplitPoint; namespace Search { +struct PVEntry { + Move pv[MAX_PLY+1]; + + void update(Move move, PVEntry* child) { + pv[0] = move; + + int i = 1; + for (; child && i < MAX_PLY && child->pv[i - 1] != MOVE_NONE; ++i) + pv[i] = child->pv[i - 1]; + pv[i] = MOVE_NONE; + } +}; + /// 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 Stack { SplitPoint* splitPoint; + PVEntry* pv; int ply; Move currentMove; Move ttMove; @@ -62,7 +76,6 @@ struct RootMove { bool operator<(const RootMove& m) const { return score > m.score; } // Ascending sort bool operator==(const Move& m) const { return pv[0] == m; } - void extract_pv_from_tt(Position& pos); void insert_pv_in_tt(Position& pos); Value score; @@ -78,13 +91,14 @@ struct RootMove { struct LimitsType { LimitsType() { // Using memset on a std::vector is undefined behavior - time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = movestogo = - depth = nodes = movetime = mate = infinite = ponder = 0; + nodes = time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = 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], movestogo, depth, nodes, movetime, mate, infinite, ponder; + int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, movetime, mate, infinite, ponder; + int64_t nodes; }; @@ -104,9 +118,9 @@ extern Position RootPos; extern Time::point SearchTime; extern StateStackPtr SetupStates; -extern void init(); -extern uint64_t perft(Position& pos, Depth depth); -extern void think(); +void init(); +void think(); +template uint64_t perft(Position& pos, Depth depth); } // namespace Search