X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=4987a53122d153e30ec6e87c727ba38e681a9426;hp=e05383ffcbdabe3ee600ddbb6ae24a905b5da202;hb=ee9e162dd5f18e18835164f94d9c5980806e518d;hpb=471e745a91074c9cb5502bc0c026cdbd3e91ee9a

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index e05383ff..4987a531 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -148,6 +148,10 @@ namespace {
 
   #undef S
 
+  // Threats weights indexed by sente (side to move has a bigger weight)
+  const int ConcurrentThreatsWeight[2] = { 3, 15 };
+  const int ThreatsWeight[2] = { 249, 267 };
+
   // Bonus for unstoppable passed pawns
   const Value UnstoppablePawnValue = Value(0x500);
 
@@ -636,6 +640,8 @@ namespace {
     const Color Them = (Us == WHITE ? BLACK : WHITE);
 
     Bitboard b;
+    Value mg, eg;
+    int sente, threatCount = 0;
     Score bonus = make_score(0, 0);
 
     // Enemy pieces not defended by a pawn and under our attack
@@ -654,9 +660,20 @@ namespace {
         if (b)
             for (PieceType pt2 = PAWN; pt2 < KING; pt2++)
                 if (b & pos.pieces(pt2))
+                {
                     bonus += ThreatBonus[pt1][pt2];
+                    threatCount++;
+                }
     }
-    ei.value += Sign[Us] * bonus;
+
+    sente = (Us == pos.side_to_move());
+
+    // Non linear threat evaluation. Increase threats score according to the
+    // number of concurrent threats and to the side to move.
+    mg = (mg_value(bonus) + mg_value(bonus) * ConcurrentThreatsWeight[sente] * threatCount / 256) * ThreatsWeight[sente] / 256;
+    eg = (eg_value(bonus) + eg_value(bonus) * ConcurrentThreatsWeight[sente] * threatCount / 256) * ThreatsWeight[sente] / 256;
+
+    ei.value += Sign[Us] * make_score(mg, eg);
   }
 
 
@@ -897,6 +914,7 @@ namespace {
             Square s = pop_1st_bit(&b);
             Square queeningSquare = relative_square(c, make_square(square_file(s), RANK_8));
             int d =  square_distance(s, queeningSquare)
+                   - (relative_rank(c, s) == RANK_2) // Double pawn push
                    - square_distance(pos.king_square(opposite_color(c)), queeningSquare)
                    + int(c != pos.side_to_move());