Rewrite unstoppable pawns evaluation

[stockfish] / src / pawns.cpp

diff --git a/src/pawns.cpp b/src/pawns.cpp
index d65b0418f0145f448c3d37dff8ecb7262c86fdaf..c5a48e930c134e361f3733391e1ee79f6e7f510a 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -99,7 +99,7 @@ namespace {
     Bitboard ourPawns = pos.pieces(Us, PAWN);
     Bitboard theirPawns = pos.pieces(Them, PAWN);
 
     Bitboard ourPawns = pos.pieces(Us, PAWN);
     Bitboard theirPawns = pos.pieces(Them, PAWN);
 

-    e->passedPawns[Us] = 0;
+    e->passedPawns[Us] = e->candidatePawns[Us] = 0;

     e->kingSquares[Us] = SQ_NONE;
     e->semiopenFiles[Us] = 0xFF;
     e->pawnAttacks[Us] = shift_bb<Right>(ourPawns) | shift_bb<Left>(ourPawns);
     e->kingSquares[Us] = SQ_NONE;
     e->semiopenFiles[Us] = 0xFF;
     e->pawnAttacks[Us] = shift_bb<Right>(ourPawns) | shift_bb<Left>(ourPawns);


@@ -179,7 +179,12 @@ namespace {
             value += ChainMember[f];
 
         if (candidate)
             value += ChainMember[f];
 
         if (candidate)

+        {

             value += CandidatePassed[relative_rank(Us, s)];
             value += CandidatePassed[relative_rank(Us, s)];

+
+            if (!doubled)
+                e->candidatePawns[Us] |= s;
+        }

     }
 
     return value;
     }
 
     return value;