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

diff --git a/src/pawns.cpp b/src/pawns.cpp
index ef456307..d589dc1a 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -61,6 +61,14 @@ namespace {
   // Unsupported pawn penalty
   const Score UnsupportedPawnPenalty = S(20, 10);
 
+  // Center bind bonus: Two pawns controlling the same central square
+  const Bitboard CenterBindMask[COLOR_NB] = {
+    (FileDBB | FileEBB) & (Rank5BB | Rank6BB | Rank7BB),
+    (FileDBB | FileEBB) & (Rank4BB | Rank3BB | Rank2BB)
+  };
+
+  const Score CenterBind = S(16, 0);
+
   // Weakness of our pawn shelter in front of the king by [distance from edge][rank]
   const Value ShelterWeakness[][RANK_NB] = {
   { V( 99), V(20), V(26), V(54), V(85), V( 92), V(108) },
@@ -102,9 +110,9 @@ namespace {
     const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW);
     const Square Left  = (Us == WHITE ? DELTA_NW : DELTA_SE);
 
-    Bitboard b, p, doubled, connected;
+    Bitboard b, p, doubled, connected, supported;
     Square s;
-    bool passed, isolated, opposed, phalanx, backward, unsupported, lever;
+    bool passed, isolated, opposed, phalanx, backward, lever;
     Score score = SCORE_ZERO;
     const Square* pl = pos.list<PAWN>(Us);
     const Bitboard* pawnAttacksBB = StepAttacksBB[make_piece(Us, PAWN)];
@@ -130,13 +138,12 @@ namespace {
         e->semiopenFiles[Us] &= ~(1 << f);
 
         // Previous rank
-        p = rank_bb(s - pawn_push(Us));
+        p = rank_bb(s - Up);
 
-        // Flag the pawn as passed, isolated, doubled,
-        // unsupported or connected (but not the backward one).
+        // Flag the pawn
         connected   =   ourPawns   & adjacent_files_bb(f) & (rank_bb(s) | p);
         phalanx     =   connected  & rank_bb(s);
-        unsupported = !(ourPawns   & adjacent_files_bb(f) & p);
+        supported   =   connected  & p;
         isolated    = !(ourPawns   & adjacent_files_bb(f));
         doubled     =   ourPawns   & forward_bb(Us, s);
         opposed     =   theirPawns & forward_bb(Us, s);
@@ -152,7 +159,7 @@ namespace {
             backward = false;
         else
         {
-            // We now know that there are no friendly pawns beside or behind this
+            // We now know there are no friendly pawns beside or behind this
             // pawn on adjacent files. We now check whether the pawn is
             // backward by looking in the forward direction on the adjacent
             // files, and picking the closest pawn there.
@@ -176,7 +183,7 @@ namespace {
         if (isolated)
             score -= Isolated[opposed][f];
 
-        if (unsupported && !isolated)
+        if (!supported && !isolated)
             score -= UnsupportedPawnPenalty;
 
         if (doubled)
@@ -185,8 +192,13 @@ namespace {
         if (backward)
             score -= Backward[opposed][f];
 
-        if (connected)
+        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 (lever)
             score += Lever[relative_rank(Us, s)];
@@ -195,6 +207,10 @@ namespace {
     b = e->semiopenFiles[Us] ^ 0xFF;
     e->pawnSpan[Us] = b ? int(msb(b) - lsb(b)) : 0;
 
+    // Center binds: Two pawns controlling the same central square
+    b = shift_bb<Right>(ourPawns) & shift_bb<Left>(ourPawns) & CenterBindMask[Us];
+    score += popcount<Max15>(b) * CenterBind;
+
     return score;
   }
 
@@ -215,7 +231,8 @@ void init()
           for (Rank r = RANK_2; r < RANK_8; ++r)
           {
               int bonus = Seed[r] + (phalanx ? (Seed[r + 1] - Seed[r]) / 2 : 0);
-              Connected[opposed][phalanx][r] = make_score(bonus / 2, bonus >> opposed);
+              bonus >>= opposed;
+              Connected[opposed][phalanx][r] = make_score( 3 * bonus / 2, bonus);
           }
 }