X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=d5cda3d80e86ef9a9f779abc1aa6b39c2bb7108e;hb=fc5b59b88bae00b7e74bbad0de7c3c33136937cf;hp=3b6cbbcd8a644d47fb599107a44a565e7276533d;hpb=a6fa683418c6a74491035601e16497851eea6be6;p=stockfish diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 3b6cbbcd..d5cda3d8 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -1056,7 +1056,7 @@ Value Eval::evaluate(const Position& pos, int* complexity) { // We use the much less accurate but faster Classical eval when the NNUE // option is set to false. Otherwise we use the NNUE eval unless the // PSQ advantage is decisive and several pieces remain. (~3 Elo) - bool useClassical = !useNNUE || (pos.count() > 7 && abs(psq) > 1760); + bool useClassical = !useNNUE || (pos.count() > 7 && abs(psq) > 1781); if (useClassical) v = Evaluation(pos).value(); @@ -1071,8 +1071,8 @@ Value Eval::evaluate(const Position& pos, int* complexity) { Value nnue = NNUE::evaluate(pos, true, &nnueComplexity); // Blend nnue complexity with (semi)classical complexity - nnueComplexity = ( 412 * nnueComplexity - + 428 * abs(psq - nnue) + nnueComplexity = ( 406 * nnueComplexity + + 424 * abs(psq - nnue) + (optimism > 0 ? int(optimism) * int(psq - nnue) : 0) ) / 1024; @@ -1080,12 +1080,12 @@ Value Eval::evaluate(const Position& pos, int* complexity) { if (complexity) *complexity = nnueComplexity; - optimism = optimism * (278 + nnueComplexity) / 256; - v = (nnue * scale + optimism * (scale - 755)) / 1024; + optimism = optimism * (272 + nnueComplexity) / 256; + v = (nnue * scale + optimism * (scale - 748)) / 1024; } // Damp down the evaluation linearly when shuffling - v = v * (197 - pos.rule50_count()) / 214; + v = v * (200 - pos.rule50_count()) / 214; // Guarantee evaluation does not hit the tablebase range v = std::clamp(v, VALUE_TB_LOSS_IN_MAX_PLY + 1, VALUE_TB_WIN_IN_MAX_PLY - 1);