X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=f60da4a514d1814192bc7b67d02679971f4e94f3;hp=1274b9681958fce4d2cbf53b6695c33505c1ab67;hb=8559c439148d0f183a5d67375c12abe92d63975e;hpb=9afa1d73306cb98e95acec5daf4efd65e592ceff diff --git a/src/search.h b/src/search.h index 1274b968..f60da4a5 100644 --- a/src/search.h +++ b/src/search.h @@ -1,8 +1,6 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 - Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2004-2020 The Stockfish developers (see AUTHORS file) Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,7 +30,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 +39,7 @@ const int CounterMovePruneThreshold = 0; struct Stack { Move* pv; - PieceToHistory* contHistory; + PieceToHistory* continuationHistory; int ply; Move currentMove; Move excludedMove; @@ -49,6 +47,9 @@ struct Stack { Value staticEval; int statScore; int moveCount; + bool inCheck; + bool ttPv; + bool ttHit; }; @@ -69,6 +70,9 @@ struct RootMove { Value score = -VALUE_INFINITE; Value previousScore = -VALUE_INFINITE; int selDepth = 0; + int tbRank = 0; + int bestMoveCount = 0; + Value tbScore; std::vector pv; }; @@ -81,19 +85,19 @@ 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 { - return !(mate | movetime | depth | nodes | perft | infinite); + return time[WHITE] || time[BLACK]; } 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;