diff --git a/src/evaluate.cpp b/src/evaluate.cpp index c4e02e4e..a52cdf09 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -655,7 +655,7 @@ namespace { !(unsafeSquares & blockSq) ? 9 : 0 ; - // Assign a larger bonus if the block square is defended. + // Assign a larger bonus if the block square is defended if (defendedSquares & blockSq) k += 5; diff --git a/src/pawns.cpp b/src/pawns.cpp index 45c40471..0d3a57bf 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -35,8 +35,8 @@ namespace { constexpr Score Backward = S( 9, 24); constexpr Score Doubled = S(11, 56); constexpr Score Isolated = S( 5, 15); - constexpr Score WeakUnopposed = S( 13, 27); - constexpr Score Attacked2Unsupported = S( 0, 20); + constexpr Score WeakUnopposed = S(13, 27); + constexpr Score Attacked2Unsupported = S(0, 56); // Connected pawn bonus constexpr int Connected[RANK_NB] = { 0, 7, 8, 12, 29, 48, 86 }; @@ -84,11 +84,6 @@ namespace { e->kingSquares[Us] = SQ_NONE; e->pawnAttacks[Us] = pawn_attacks_bb(ourPawns); - // Unsupported enemy pawns attacked twice by us - score += Attacked2Unsupported * popcount( theirPawns - & pawn_double_attacks_bb(ourPawns) - & ~pawn_attacks_bb(theirPawns)); - // Loop through all pawns of the current color and score each pawn while ((s = *pl++) != SQ_NONE) { @@ -116,8 +111,8 @@ namespace { // Passed pawns will be properly scored in evaluation because we need // full attack info to evaluate them. Include also not passed pawns - // which could become passed after one or two pawn pushes when are - // not attacked more times than defended. + // which could become passed after one or two pawn pushes when they + // are not attacked more times than defended. if ( !(stoppers ^ lever) || (!(stoppers ^ leverPush) && popcount(phalanx) >= popcount(leverPush))) e->passedPawns[Us] |= s; @@ -149,6 +144,12 @@ namespace { score -= Doubled; } + // Unsupported friendly pawns attacked twice by the enemy + score -= Attacked2Unsupported * popcount( ourPawns + & pawn_double_attacks_bb(theirPawns) + & ~pawn_attacks_bb(ourPawns) + & ~e->passedPawns[Us]); + return score; }