Further simplify previous patch

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 3481b03d7c77ad2a01622eb7abd1960ffab7ca4a..108f6c8a39e68bf74370b437a1a52b3d58182ff9 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -156,12 +156,12 @@ namespace {
   const Score Tempo = make_score(24, 11);
 
   // Rooks and queens on the 7th rank
-  const Score RookOn7thBonus  = make_score(3, 20);
-  const Score QueenOn7thBonus = make_score(1,  8);
+  const Score RookOn7thBonus  = make_score(11, 20);
+  const Score QueenOn7thBonus = make_score( 3,  8);
 
   // Rooks and queens attacking pawns on the same rank
-  const Score RookOnPawnBonus  = make_score(3, 48);
-  const Score QueenOnPawnBonus = make_score(1, 40);
+  const Score RookOnPawnBonus  = make_score(10, 28);
+  const Score QueenOnPawnBonus = make_score( 4, 20);
 
   // Rooks on open files (modified by Joona Kiiski)
   const Score RookOpenFileBonus     = make_score(43, 21);
@@ -171,6 +171,9 @@ namespace {
   // right to castle.
   const Value TrappedRookPenalty = Value(180);
 
+  // Penalty for bishop with pawns on the same coloured squares
+  const Score BishopPawnsPenalty = make_score(8, 12);
+
   // 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
   // happen in Chess960 games.
@@ -584,7 +587,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
 
         // Penalty for bishop with same coloured pawns
         if (Piece == BISHOP)
-            score -= make_score(4, 4) * ei.pi->same_colored_pawn_count(s, Us); 
+            score -= BishopPawnsPenalty * ei.pi->pawns_on_same_color_squares(Us, s);
 
         // Bishop and knight outposts squares
         if (    (Piece == BISHOP || Piece == KNIGHT)
@@ -645,25 +648,13 @@ Value do_evaluate(const Position& pos, Value& margin) {
                 continue;
 
             ksq = pos.king_square(Us);
+            bool left = file_of(ksq) < FILE_E;
 
-            if (    file_of(ksq) >= FILE_E
-                &&  file_of(s) > file_of(ksq)
-                && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s)))
-            {
-                // Is there a half-open file between the king and the edge of the board?
-                if (!ei.pi->has_open_file_to_right(Us, file_of(ksq)))
-                    score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
-                                                           : (TrappedRookPenalty - mob * 16), 0);
-            }
-            else if (    file_of(ksq) <= FILE_D
-                     &&  file_of(s) < file_of(ksq)
-                     && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s)))
-            {
-                // Is there a half-open file between the king and the edge of the board?
-                if (!ei.pi->has_open_file_to_left(Us, file_of(ksq)))
-                    score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
-                                                           : (TrappedRookPenalty - mob * 16), 0);
-            }
+            if (   ((left && file_of(s) < file_of(ksq)) || (!left && file_of(s) > file_of(ksq)))
+                && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(s))
+                && (!ei.pi->has_open_file_on_side(Us, file_of(ksq), left)))
+                score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2
+                                                       : (TrappedRookPenalty - mob * 16), 0);
         }
     }
 
@@ -727,7 +718,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
     Score score = mobility = SCORE_ZERO;
 
     // Do not include in mobility squares protected by enemy pawns or occupied by our pieces
-    const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces(Us));
+    const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces(Us, PAWN, KING));
 
     score += evaluate_pieces<KNIGHT, Us, Trace>(pos, ei, mobility, mobilityArea);
     score += evaluate_pieces<BISHOP, Us, Trace>(pos, ei, mobility, mobilityArea);