X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=20cfd4741fab7ca35c2e55979e6794eecb373409;hp=2a943dd9ede78723d3063eb9597adf419f079b3e;hb=f6d220ab145a361f7240a44dbe61056e801d9bda;hpb=bc83515c9e821016d2113298ef988e99ceced1af diff --git a/src/search.h b/src/search.h index 2a943dd9..20cfd474 100644 --- a/src/search.h +++ b/src/search.h @@ -38,6 +38,7 @@ namespace Search { struct Stack { SplitPoint* splitPoint; + Move* pv; int ply; Move currentMove; Move ttMove; @@ -45,7 +46,7 @@ struct Stack { Move killers[2]; Depth reduction; Value staticEval; - bool skipNullMove; + bool skipEarlyPruning; }; @@ -55,21 +56,19 @@ struct Stack { /// all non-pv moves. struct RootMove { - RootMove(Move m) : score(-VALUE_INFINITE), prevScore(-VALUE_INFINITE) { - pv.push_back(m); pv.push_back(MOVE_NONE); - } + RootMove(Move m) : score(-VALUE_INFINITE), previousScore(-VALUE_INFINITE), pv(1, m) {} 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; - Value prevScore; + Value previousScore; std::vector pv; }; +typedef std::vector RootMoveVector; /// 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 @@ -100,7 +99,7 @@ typedef std::auto_ptr > StateStackPtr; extern volatile SignalsType Signals; extern LimitsType Limits; -extern std::vector RootMoves; +extern RootMoveVector RootMoves; extern Position RootPos; extern Time::point SearchTime; extern StateStackPtr SetupStates;