Assorted small cleanups

closes https://github.com/official-stockfish/Stockfish/pull/3973

No functional change
This commit is contained in:
Giacomo Lorenzetti
2022-04-01 18:33:25 +02:00
committed by Joost VandeVondele
parent cc7bcd5303
commit f7d1491b3d
8 changed files with 42 additions and 48 deletions
+5 -5
View File
@@ -192,7 +192,6 @@ using namespace Trace;
namespace {
// Threshold for lazy and space evaluation
constexpr Value LazyThreshold1 = Value(3631);
constexpr Value LazyThreshold2 = Value(2084);
@@ -1084,13 +1083,14 @@ make_v:
Value Eval::evaluate(const Position& pos) {
Value v;
bool useClassical = false;
// Deciding between classical and NNUE eval (~10 Elo): for high PSQ imbalance we use classical,
// but we switch to NNUE during long shuffling or with high material on the board.
bool useClassical = (pos.this_thread()->depth > 9 || pos.count<ALL_PIECES>() > 7) &&
abs(eg_value(pos.psq_score())) * 5 > (856 + pos.non_pawn_material() / 64) * (10 + pos.rule50_count());
// Deciding between classical and NNUE eval (~10 Elo): for high PSQ imbalance we use classical,
// but we switch to NNUE during long shuffling or with high material on the board.
if ( !useNNUE
|| ((pos.this_thread()->depth > 9 || pos.count<ALL_PIECES>() > 7) &&
abs(eg_value(pos.psq_score())) * 5 > (856 + pos.non_pawn_material() / 64) * (10 + pos.rule50_count())))
if (!useNNUE || useClassical)
{
v = Evaluation<NO_TRACE>(pos).value(); // classical
useClassical = abs(v) >= 297;