Almost passed tuning attempts

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index bbca9964f4337d9506c23d0d49353af9f0e2e9d3..44a0669f9c0ca7c13f8ceda90141a235cccc811f 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -126,19 +126,19 @@ namespace {
   // friendly pieces.
   const Score MobilityBonus[][32] = {
     {}, {},
-    { S(-68,-49), S(-46,-33), S(-3,-12), S( 5, -4), S( 9, 11), S(15, 16), // Knights
-      S( 23, 27), S( 33, 28), S(37, 29) },
-    { S(-49,-44), S(-23,-16), S(16,  1), S(29, 16), S(40, 25), S(51, 34), // Bishops
-      S( 55, 43), S( 61, 49), S(64, 51), S(68, 52), S(73, 55), S(75, 60),
-      S( 80, 65), S( 86, 66) },
-    { S(-50,-57), S(-28,-22), S(-11, 7), S(-1, 29), S( 0, 39), S( 1, 46), // Rooks
-      S( 10, 66), S( 16, 79), S(22, 86), S(23,103), S(30,109), S(33,111),
-      S( 37,115), S( 38,119), S(48,124) },
-    { S(-43,-30), S(-27,-15), S( 1, -5), S( 2, -3), S(14, 10), S(18, 24), // Queens
-      S( 20, 27), S( 33, 37), S(33, 38), S(34, 43), S(40, 46), S(43, 56),
-      S( 46, 61), S( 52, 63), S(52, 63), S(57, 65), S(60, 70), S(61, 74),
-      S( 67, 80), S( 76, 82), S(77, 88), S(82, 94), S(86, 95), S(90, 96),
-      S( 94, 99), S( 96,100), S(99,111), S(99,112) }
+    { S(-70,-52), S(-52,-37), S( -7,-17), S(  0, -6), S(  8,  5), S( 16,  9), // Knights
+      S( 23, 20), S( 31, 21), S( 36, 22) },
+    { S(-49,-44), S(-22,-13), S( 16,  0), S( 27, 11), S( 38, 19), S( 52, 34), // Bishops
+      S( 56, 44), S( 65, 47), S( 67, 51), S( 73, 56), S( 81, 59), S( 83, 69),
+      S( 95, 72), S(100, 75) },
+    { S(-49,-57), S(-22,-14), S(-10, 18), S( -5, 39), S( -4, 50), S( -2, 58), // Rooks
+      S(  6, 78), S( 11, 86), S( 17, 92), S( 19,103), S( 26,111), S( 27,115),
+      S( 36,119), S( 41,121), S( 50,122) },
+    { S(-41,-24), S(-26, -8), S(  0,  6), S(  2, 14), S( 12, 27), S( 21, 40), // Queens
+      S( 22, 45), S( 37, 55), S( 40, 57), S( 43, 63), S( 50, 68), S( 52, 74),
+      S( 56, 80), S( 66, 84), S( 68, 85), S( 69, 88), S( 71, 92), S( 72, 94),
+      S( 80, 96), S( 89, 98), S( 94,101), S(102,113), S(106,114), S(107,116),
+      S(112,125), S(113,127), S(117,137), S(122,143) }
   };
 
   // Outpost[knight/bishop][supported by pawn] contains bonuses for knights and
@@ -172,8 +172,8 @@ namespace {
 
   // PassedFile[File] contains a bonus according to the file of a passed pawn.
   const Score PassedFile[] = {
-    S( 14,  13), S( 2,  5), S(-3, -4), S(-19, -14),
-    S(-19, -14), S(-3, -4), S( 2,  5), S( 14,  13)
+    S( 12,  10), S( 3,  10), S( 1, -8), S(-27, -12),
+    S(-27, -12), S( 1, -8),  S( 3, 10), S( 12,  10)
   };
 
   const Score ThreatenedByHangingPawn = S(40, 60);
@@ -414,7 +414,8 @@ namespace {
         {
             // ...and then remove squares not supported by another enemy piece
             b &=  ei.attackedBy[Them][PAWN]   | ei.attackedBy[Them][KNIGHT]
-                | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][ROOK];
+                | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][ROOK]
+                | ei.attackedBy[Them][KING];
 
             if (b)
                 attackUnits += QueenContactCheck * popcount<Max15>(b);