X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=40c43d230434a910e9451b926d4f5fba5ae39ca3;hb=07bd8adcbce41f076c36f4b65c7f9a786de0b02d;hp=d8f4e2e194f652417612b72ce9c31b7aaf98f649;hpb=21d6b69f7c8d0c0a71fe627714913a59d39a3b57;p=stockfish

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index d8f4e2e1..40c43d23 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -1063,7 +1063,7 @@ Value Eval::evaluate(const Position& pos) {
   else
   {
       int nnueComplexity;
-      int scale = 967 + pos.non_pawn_material() / 64;
+      int npm = pos.non_pawn_material() / 64;
 
       Color stm = pos.side_to_move();
       Value optimism = pos.this_thread()->optimism[stm];
@@ -1071,12 +1071,10 @@ Value Eval::evaluate(const Position& pos) {
       Value nnue = NNUE::evaluate(pos, true, &nnueComplexity);
 
       // Blend nnue complexity with (semi)classical complexity
-      nnueComplexity = (  402 * nnueComplexity
-                        + (454 + optimism) * abs(psq - nnue)
-                        ) / 1024;
+      nnueComplexity = 25 * (nnueComplexity + abs(psq - nnue)) / 64;
 
-      optimism = optimism * (274 + nnueComplexity) / 256;
-      v = (nnue * scale + optimism * (scale - 791)) / 1024;
+      optimism += optimism * nnueComplexity / 256;
+      v = (nnue * (945 + npm) + optimism * (174 + npm)) / 1024;
   }
 
   // Damp down the evaluation linearly when shuffling