X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=e582692e3251c38bd7df3cbf3404aa0a8c5841c3;hp=d589dc1a3cf12ca81c0fc81c3544ce65e6f3c853;hb=8a2c4134a650429488df48e1a02228cdb0fdf63d;hpb=fce799294c124a096b15539bb863788ec3a68cf6

diff --git a/src/pawns.cpp b/src/pawns.cpp
index d589dc1a..e582692e 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -50,8 +50,8 @@ namespace {
   { S(20, 28), S(29, 31), S(33, 31), S(33, 31),
     S(33, 31), S(33, 31), S(29, 31), S(20, 28) } };
 
-  // Connected pawn bonus by opposed, phalanx flags and rank
-  Score Connected[2][2][RANK_NB];
+  // Connected pawn bonus by opposed, phalanx, twice supported and rank
+  Score Connected[2][2][2][RANK_NB];
 
   // Levers bonus by rank
   const Score Lever[RANK_NB] = {
@@ -192,13 +192,8 @@ namespace {
         if (backward)
             score -= Backward[opposed][f];
 
-        if (connected) {
-            score += Connected[opposed][phalanx][relative_rank(Us, s)];
-            if (more_than_one(supported)) {
-                //apex bonus: pawn on s is supported twice
-                score += Connected[opposed][phalanx][relative_rank(Us, s)] / 2;
-            }
-        }
+        if (connected)
+            score += Connected[opposed][phalanx][more_than_one(supported)][relative_rank(Us, s)];
 
         if (lever)
             score += Lever[relative_rank(Us, s)];
@@ -228,12 +223,13 @@ void init()
 
   for (int opposed = 0; opposed <= 1; ++opposed)
       for (int phalanx = 0; phalanx <= 1; ++phalanx)
-          for (Rank r = RANK_2; r < RANK_8; ++r)
-          {
-              int bonus = Seed[r] + (phalanx ? (Seed[r + 1] - Seed[r]) / 2 : 0);
-              bonus >>= opposed;
-              Connected[opposed][phalanx][r] = make_score( 3 * bonus / 2, bonus);
-          }
+          for (int apex = 0; apex <= 1; ++apex)
+              for (Rank r = RANK_2; r < RANK_8; ++r)
+  {
+      int v = (Seed[r] + (phalanx ? (Seed[r + 1] - Seed[r]) / 2 : 0)) >> opposed;
+      v += (apex ? v / 2 : 0);
+      Connected[opposed][phalanx][apex][r] = make_score(3 * v / 2, v);
+  }
 }