From: Marco Costalba <mcostalba@gmail.com>
Date: Wed, 8 May 2013 21:02:08 +0000 (+0200)
Subject: Merge 'passed_pawns' tweaks
X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=02606a8c8360782c5c14e6a76fd7867f2cb9552d;hp=-c

Merge 'passed_pawns' tweaks

Good at both short and long TC

15+0.05
LLR: 2.96 (-2.94,2.94)
Total: 28220 W: 5531 L: 5349 D: 17340

TC 60+0.05
LLR: 2.95 (-2.94,2.94)
Total: 12612 W: 2221 L: 2057 D: 8334

bench: 4857939
---

02606a8c8360782c5c14e6a76fd7867f2cb9552d
diff --combined src/evaluate.cpp
index 854ab42a,c2f025fc..94ec2b6c
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@@ -677,7 -677,8 +677,7 @@@ Value do_evaluate(const Position& pos, 
      Score score = SCORE_ZERO;
  
      // Undefended minors get penalized even if not under attack
 -    undefendedMinors =  pos.pieces(Them)
 -                      & (pos.pieces(BISHOP) | pos.pieces(KNIGHT))
 +    undefendedMinors =  pos.pieces(Them, BISHOP, KNIGHT)
                        & ~ei.attackedBy[Them][ALL_PIECES];
  
      if (undefendedMinors)
@@@ -899,16 -900,30 +899,30 @@@
                  else
                      unsafeSquares = squaresToQueen & (ei.attackedBy[Them][ALL_PIECES] | pos.pieces(Them));
  
-                 // If there aren't enemy attacks or pieces along the path to queen give
-                 // huge bonus. Even bigger if we protect the pawn's path.
-                 if (!unsafeSquares)
-                     ebonus += Value(rr * (squaresToQueen == defendedSquares ? 17 : 15));
-                 else
-                     // OK, there are enemy attacks or pieces (but not pawns). Are those
-                     // squares which are attacked by the enemy also attacked by us ?
-                     // If yes, big bonus (but smaller than when there are no enemy attacks),
-                     // if no, somewhat smaller bonus.
-                     ebonus += Value(rr * ((unsafeSquares & defendedSquares) == unsafeSquares ? 13 : 8));
+                 // Default bonus for the empty square in front
+                 int bonusMultiplier = 3;
+ 
+                 if ((defendedSquares & SquareBB[blockSq]) != 0)
+                 {
+                     // Defending the square in front
+                     bonusMultiplier += 2;
+                     if ((unsafeSquares & defendedSquares) == unsafeSquares)
+                         // Defending all the attacked squares
+                         // bigger bonus if we are defending everything
+                         bonusMultiplier += (squaresToQueen == defendedSquares) ? 4 : 2;
+                 }
+ 
+                 if ((unsafeSquares & SquareBB[blockSq]) == 0)
+                 {
+                     // The square infront isn't attacked
+                     bonusMultiplier += 6;
+                     if (!unsafeSquares)
+                         bonusMultiplier += 6;
+                 }
+ 
+                 Value bonus = Value(rr * bonusMultiplier);
+                 ebonus += bonus;
+                 mbonus += bonus;
              }
          } // rr != 0