X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=e3ac5ab6a78edcb111be4df4103989aa98e5f263;hp=1274b9681958fce4d2cbf53b6695c33505c1ab67;hb=12e79be91039796299187ba1b2f1559552642ea4;hpb=9afa1d73306cb98e95acec5daf4efd65e592ceff diff --git a/src/search.h b/src/search.h index 1274b968..e3ac5ab6 100644 --- a/src/search.h +++ b/src/search.h @@ -32,7 +32,7 @@ class Position; namespace Search { /// Threshold used for countermoves based pruning -const int CounterMovePruneThreshold = 0; +constexpr int CounterMovePruneThreshold = 0; /// Stack struct keeps track of the information we need to remember from nodes @@ -41,7 +41,7 @@ const int CounterMovePruneThreshold = 0; struct Stack { Move* pv; - PieceToHistory* contHistory; + PieceToHistory* continuationHistory; int ply; Move currentMove; Move excludedMove; @@ -69,6 +69,8 @@ struct RootMove { Value score = -VALUE_INFINITE; Value previousScore = -VALUE_INFINITE; int selDepth = 0; + int tbRank; + Value tbScore; std::vector pv; }; @@ -81,8 +83,9 @@ typedef std::vector RootMoves; 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 = perft = infinite = 0; + time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = npmsec = movetime = TimePoint(0); + movestogo = depth = mate = perft = infinite = 0; + nodes = 0; } bool use_time_management() const { @@ -90,10 +93,9 @@ struct LimitsType { } std::vector searchmoves; - int time[COLOR_NB], inc[COLOR_NB], npmsec, movestogo, depth, - movetime, mate, perft, infinite; + TimePoint time[COLOR_NB], inc[COLOR_NB], npmsec, movetime, startTime; + int movestogo, depth, mate, perft, infinite; int64_t nodes; - TimePoint startTime; }; extern LimitsType Limits;