// Pawn penalties
constexpr Score Backward = S( 9, 24);
- constexpr Score BlockedStorm = S(82, 82);
constexpr Score Doubled = S(11, 56);
constexpr Score Isolated = S( 5, 15);
constexpr Score WeakLever = S( 0, 56);
constexpr Score WeakUnopposed = S(13, 27);
+ constexpr Score BlockedStorm[RANK_NB] = {S( 0, 0), S( 0, 0), S( 76, 78), S(-10, 15), S(-7, 10), S(-4, 6), S(-1, 2)};
+
// Connected pawn bonus
constexpr int Connected[RANK_NB] = { 0, 7, 8, 12, 29, 48, 86 };
e->passedPawns[Us] = 0;
e->kingSquares[Us] = SQ_NONE;
e->pawnAttacks[Us] = e->pawnAttacksSpan[Us] = pawn_attacks_bb<Us>(ourPawns);
- e->blockedCount[Us] = 0;
+ e->blockedCount += popcount(shift<Up>(ourPawns) & (theirPawns | doubleAttackThem));
// Loop through all pawns of the current color and score each pawn
while ((s = *pl++) != SQ_NONE)
phalanx = neighbours & rank_bb(s);
support = neighbours & rank_bb(s - Up);
- e->blockedCount[Us] += blocked || more_than_one(leverPush);
-
// A pawn is backward when it is behind all pawns of the same color on
// the adjacent files and cannot safely advance.
backward = !(neighbours & forward_ranks_bb(Them, s + Up))
}
else if (!neighbours)
+ {
score -= Isolated
+ WeakUnopposed * !opposed;
+ if ( (ourPawns & forward_file_bb(Them, s))
+ && popcount(opposed) == 1
+ && !(theirPawns & adjacent_files_bb(s)))
+ score -= Doubled;
+ }
+
else if (backward)
score -= Backward
+ WeakUnopposed * !opposed;
return e;
e->key = key;
+ e->blockedCount = 0;
e->scores[WHITE] = evaluate<WHITE>(pos, e);
e->scores[BLACK] = evaluate<BLACK>(pos, e);
constexpr Color Them = ~Us;
Bitboard b = pos.pieces(PAWN) & ~forward_ranks_bb(Them, ksq);
- Bitboard ourPawns = b & pos.pieces(Us);
- Bitboard theirPawns = b & pos.pieces(Them);
+ Bitboard ourPawns = b & pos.pieces(Us) & ~pawnAttacks[Them];
+ Bitboard theirPawns = b & pos.pieces(Them) & ~pawnAttacks[Us];
Score bonus = make_score(5, 5);
b = theirPawns & file_bb(f);
int theirRank = b ? relative_rank(Us, frontmost_sq(Them, b)) : 0;
- File d = File(edge_distance(f));
+ int d = edge_distance(f);
bonus += make_score(ShelterStrength[d][ourRank], 0);
if (ourRank && (ourRank == theirRank - 1))
- bonus -= BlockedStorm * int(theirRank == RANK_3);
+ bonus -= BlockedStorm[theirRank];
else
bonus -= make_score(UnblockedStorm[d][theirRank], 0);
}