tviigg. (#2238)

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index b20c93b706296c94b1a0c8652c4e4c87cb6a95e3..8b017a5c880e8d1321cc2279ad6a97c097402ccb 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -605,7 +605,7 @@ namespace {
       return std::min(distance(pos.square<KING>(c), s), 5);
     };
 
       return std::min(distance(pos.square<KING>(c), s), 5);
     };
 

-    Bitboard b, bb, squaresToQueen, defendedSquares, unsafeSquares;
+    Bitboard b, bb, squaresToQueen, unsafeSquares;

     Score score = SCORE_ZERO;
 
     b = pe->passed_pawns(Us);
     Score score = SCORE_ZERO;
 
     b = pe->passed_pawns(Us);


@@ -636,14 +636,11 @@ namespace {
             // If the pawn is free to advance, then increase the bonus
             if (pos.empty(blockSq))
             {
             // If the pawn is free to advance, then increase the bonus
             if (pos.empty(blockSq))
             {

-                defendedSquares = squaresToQueen = forward_file_bb(Us, s);
+                squaresToQueen = forward_file_bb(Us, s);

                 unsafeSquares = passed_pawn_span(Us, s);
 
                 bb = forward_file_bb(Them, s) & pos.pieces(ROOK, QUEEN);
 
                 unsafeSquares = passed_pawn_span(Us, s);
 
                 bb = forward_file_bb(Them, s) & pos.pieces(ROOK, QUEEN);
 

-                if (!(pos.pieces(Us) & bb))
-                    defendedSquares &= attackedBy[Us][ALL_PIECES];
-

                 if (!(pos.pieces(Them) & bb))
                     unsafeSquares &= attackedBy[Them][ALL_PIECES] | pos.pieces(Them);
 
                 if (!(pos.pieces(Them) & bb))
                     unsafeSquares &= attackedBy[Them][ALL_PIECES] | pos.pieces(Them);
 


@@ -656,7 +653,7 @@ namespace {
                                                              0 ;
 
                 // Assign a larger bonus if the block square is defended
                                                              0 ;
 
                 // Assign a larger bonus if the block square is defended

-                if (defendedSquares & blockSq)
+                if ((pos.pieces(Us) & bb) || (attackedBy[Us][ALL_PIECES] & blockSq))

                     k += 5;
 
                 bonus += make_score(k * w, k * w);
                     k += 5;
 
                 bonus += make_score(k * w, k * w);