X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;fp=src%2Fevaluate.cpp;h=6e515d88998f612c8dea4669e3d577cb9802636b;hp=b2cae94c0e30de30956bfa6d9a92107e1b1e0db1;hb=a56322fde813094afd8ffa60d12761f94e0bd3ef;hpb=3d0d0237c52474fa7b5e4d9f52d985a69d87df2c

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index b2cae94c..6e515d88 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -167,8 +167,8 @@ namespace {
   // happen in Chess960 games.
   const Score TrappedBishopA1H1Penalty = make_score(100, 100);
 
-  // Penalty for a minor piece that is not defended by anything
-  const Score UndefendedMinorPenalty = make_score(25, 10);
+  // Penalty for BNR that is not defended by anything
+  const Score UndefendedPiecePenalty = make_score(25, 10);
 
   // The SpaceMask[Color] contains the area of the board which is considered
   // by the space evaluation. In the middle game, each side is given a bonus
@@ -678,21 +678,24 @@ Value do_evaluate(const Position& pos, Value& margin) {
 
     const Color Them = (Us == WHITE ? BLACK : WHITE);
 
-    Bitboard b;
+    Bitboard b, undefended, undefendedMinors, weakEnemies;
     Score score = SCORE_ZERO;
 
-    // Undefended minors get penalized even if not under attack
-    Bitboard undefended =  pos.pieces(Them)
-                         & (pos.pieces(BISHOP) | pos.pieces(KNIGHT))
-                         & ~ei.attackedBy[Them][0];
-    if (undefended)
-        score += single_bit(undefended) ? UndefendedMinorPenalty
-                                        : UndefendedMinorPenalty * 2;
+    // Undefended pieces get penalized even if not under attack
+    undefended = pos.pieces(Them) & ~ei.attackedBy[Them][0];
+    undefendedMinors = undefended & (pos.pieces(BISHOP) | pos.pieces(KNIGHT));
+
+    if (undefendedMinors)
+        score += single_bit(undefendedMinors) ? UndefendedPiecePenalty
+                                              : UndefendedPiecePenalty * 2;
+    if (undefended & pos.pieces(ROOK))
+        score += UndefendedPiecePenalty;
 
     // Enemy pieces not defended by a pawn and under our attack
-    Bitboard weakEnemies =  pos.pieces(Them)
-                          & ~ei.attackedBy[Them][PAWN]
-                          & ei.attackedBy[Us][0];
+    weakEnemies =  pos.pieces(Them)
+                 & ~ei.attackedBy[Them][PAWN]
+                 & ei.attackedBy[Us][0];
+
     if (!weakEnemies)
         return score;