X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=64f9172574a4d7fda710a4ffde587e9ea4fc065d;hb=b939c805139e4b37f04fbf177f580c35ebe9f130;hp=f9754795603bd413b38cce6a565d2e23777426b8;hpb=0470bcef0e1962b4f8da15108170b991d3f90d0e;p=stockfish diff --git a/src/evaluate.cpp b/src/evaluate.cpp index f9754795..64f91725 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -190,8 +190,8 @@ using namespace Trace; namespace { // Threshold for lazy and space evaluation - constexpr Value LazyThreshold1 = Value(1565); - constexpr Value LazyThreshold2 = Value(1102); + constexpr Value LazyThreshold1 = Value(3130); + constexpr Value LazyThreshold2 = Value(2204); constexpr Value SpaceThreshold = Value(11551); // KingAttackWeights[PieceType] contains king attack weights by piece type @@ -986,7 +986,7 @@ namespace { // Early exit if score is high auto lazy_skip = [&](Value lazyThreshold) { - return abs(mg_value(score) + eg_value(score)) / 2 > lazyThreshold + pos.non_pawn_material() / 64; + return abs(mg_value(score) + eg_value(score)) > lazyThreshold + pos.non_pawn_material() / 32; }; if (lazy_skip(LazyThreshold1)) @@ -1090,7 +1090,7 @@ Value Eval::evaluate(const Position& pos) { // Scale and shift NNUE for compatibility with search and classical evaluation auto adjusted_NNUE = [&]() { - int scale = 903 + int scale = 883 + 32 * pos.count() + 32 * pos.non_pawn_material() / 1024; @@ -1106,7 +1106,7 @@ Value Eval::evaluate(const Position& pos) { // NNUE eval faster when shuffling or if the material on the board is high. int r50 = pos.rule50_count(); Value psq = Value(abs(eg_value(pos.psq_score()))); - bool classical = psq * 5 > (750 + pos.non_pawn_material() / 64) * (5 + r50); + bool classical = psq * 5 > (850 + pos.non_pawn_material() / 64) * (5 + r50); v = classical ? Evaluation(pos).value() // classical : adjusted_NNUE(); // NNUE