From 9b80897657bde99cfb6568d8bd3386c3999f22c4 Mon Sep 17 00:00:00 2001 From: mstembera Date: Wed, 9 Aug 2023 11:48:33 -0700 Subject: [PATCH] Simplify material difference in evaluate STC: https://tests.stockfishchess.org/tests/view/64d166235b17f7c21c0ddc15 LLR: 2.94 (-2.94,2.94) <-1.75,0.25> Total: 100032 W: 25698 L: 25547 D: 48787 Ptnml(0-2): 308, 11748, 25771, 11863, 326 LTC: https://tests.stockfishchess.org/tests/view/64d28c085b17f7c21c0df775 LLR: 2.94 (-2.94,2.94) <-1.75,0.25> Total: 123870 W: 31463 L: 31348 D: 61059 Ptnml(0-2): 63, 13487, 34719, 13604, 62 Besides rebasing I replaced PawnValueMg w/ 126 explicitly to decouple from https://tests.stockfishchess.org/tests/view/64d212de5b17f7c21c0debbb by @peregrineshahin which also passed. #4734 closes https://github.com/official-stockfish/Stockfish/pull/4731 Bench: 1447866 --- src/evaluate.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index c37dd98ad1c..728990680f6 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -152,11 +152,8 @@ Value Eval::evaluate(const Position& pos) { Value nnue = NNUE::evaluate(pos, true, &nnueComplexity); - int material = 67 * (pos.count(stm) - pos.count(~stm)) - + 395 * (pos.count(stm) - pos.count(~stm)) - + 288 * (pos.count(stm) - pos.count(~stm)) - + 630 * (pos.count(stm) - pos.count(~stm)) - + 857 * (pos.count(stm) - pos.count(~stm)); + int material = pos.non_pawn_material(stm) - pos.non_pawn_material(~stm) + + 126 * (pos.count(stm) - pos.count(~stm)); // Blend optimism with nnue complexity and (semi)classical complexity optimism += optimism * (nnueComplexity + abs(material - nnue)) / 512;