X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=04d41d5f6b0880d569aca2e14fe11811d66e2c54;hb=9d53129075177cb11b63b43236556051ba60f7dd;hp=256bd9944f3a6e9a4bb6a0c3a186117af56dcc93;hpb=e8d64af1230fdac65bb0da246df3e7abe82e0838;p=stockfish diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 256bd994..04d41d5f 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -214,11 +214,12 @@ using namespace Trace; namespace { // Threshold for lazy and space evaluation - constexpr Value LazyThreshold1 = Value(1565); - constexpr Value LazyThreshold2 = Value(1102); - constexpr Value SpaceThreshold = Value(11551); - constexpr Value NNUEThreshold1 = Value(682); - constexpr Value NNUEThreshold2 = Value(176); + constexpr Value LazyThreshold1 = Value(1565); + constexpr Value LazyThreshold2 = Value(1102); + constexpr Value LazyThresholdNNUE = Value(1400); + constexpr Value SpaceThreshold = Value(11551); + constexpr Value NNUEThreshold1 = Value(682); + constexpr Value NNUEThreshold2 = Value(176); // KingAttackWeights[PieceType] contains king attack weights by piece type constexpr int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 81, 52, 44, 10 }; @@ -1058,7 +1059,7 @@ make_v: v = (v / 16) * 16; // Side to move point of view - v = (pos.side_to_move() == WHITE ? v : -v) + Tempo; + v = (pos.side_to_move() == WHITE ? v : -v); return v; } @@ -1119,7 +1120,7 @@ Value Eval::evaluate(const Position& pos) { int scale = 903 + 28 * pos.count() + 28 * pos.non_pawn_material() / 1024; - Value nnue = NNUE::evaluate(pos) * scale / 1024 + Time.tempoNNUE; + Value nnue = NNUE::evaluate(pos, true, LazyThresholdNNUE) * scale / 1024; if (pos.is_chess960()) nnue += fix_FRC(pos);