From: Marco Costalba <mcostalba@gmail.com>
Date: Sun, 22 Feb 2015 13:19:12 +0000 (+0100)
Subject: Sync with master
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=8d16111ffde1689d48d47ec379ba91613213183c;hp=e74c2df907d5336d3d2b8ee7748b82270ebbf337

Sync with master

bench: 8253813
---

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 6c46cb4b..1593a68c 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -61,11 +61,11 @@ namespace {
     // KingAttackWeights array.
     int kingAttackersWeight[COLOR_NB];
 
-    // kingAdjacentZoneAttacksCount[color] is the number of attacks to squares
-    // directly adjacent to the king of the given color. Pieces which attack
-    // more than one square are counted multiple times. For instance, if black's
-    // king is on g8 and there's a white knight on g5, this knight adds
-    // 2 to kingAdjacentZoneAttacksCount[BLACK].
+    // kingAdjacentZoneAttacksCount[color] is the number of attacks by the given
+    // color to squares directly adjacent to the enemy king. Pieces which attack
+    // more than one square are counted multiple times. For instance, if there is
+    // a white knight on g5 and black's king is on g8, this white knight adds 2
+    // to kingAdjacentZoneAttacksCount[WHITE].
     int kingAdjacentZoneAttacksCount[COLOR_NB];
 
     Bitboard pinnedPieces[COLOR_NB];
@@ -162,7 +162,7 @@ namespace {
   const Score Unstoppable        = S( 0, 20);
   const Score Hanging            = S(31, 26);
   const Score PawnAttackThreat   = S(20, 20);
-  const Score PawnSafePush       = S( 5 , 5);
+  const Score PawnSafePush       = S( 5,  5);
 
   // Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by
   // a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only
diff --git a/src/pawns.cpp b/src/pawns.cpp
index d66233ca..41c9e15d 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -227,7 +227,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);
           }
 }