constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
constexpr Direction Up = (Us == WHITE ? NORTH : SOUTH);
- Bitboard neighbours, stoppers, doubled, support, phalanx;
+ Bitboard neighbours, stoppers, support, phalanx;
Bitboard lever, leverPush;
Square s;
- bool opposed, backward, passed;
+ bool opposed, backward, passed, doubled;
Score score = SCORE_ZERO;
const Square* pl = pos.squares<PAWN>(Us);
// Score this pawn
if (support | phalanx)
{
- int v = Connected[r] * (phalanx ? 3 : 2) / (opposed ? 2 : 1)
- + 17 * popcount(support);
+ int v = Connected[r] * (2 + bool(phalanx) - opposed)
+ + 21 * popcount(support);
score += make_score(v, v * (r - 2) / 4);
}
else if (!neighbours)
- score -= Isolated + WeakUnopposed * int(!opposed);
+ score -= Isolated + WeakUnopposed * !opposed;
else if (backward)
- score -= Backward + WeakUnopposed * int(!opposed);
+ score -= Backward + WeakUnopposed * !opposed;
- if (doubled && !support)
- score -= Doubled;
+ if (!support)
+ score -= Doubled * doubled
+ + WeakLever * more_than_one(lever);
}
- // Penalize our unsupported pawns attacked twice by enemy pawns
- score -= WeakLever * popcount( ourPawns
- & doubleAttackThem
- & ~e->pawnAttacks[Us]);
-
return score;
}
b = theirPawns & file_bb(f);
int theirRank = b ? relative_rank(Us, frontmost_sq(Them, b)) : 0;
- int d = std::min(f, ~f);
+ File d = map_to_queenside(f);
bonus += make_score(ShelterStrength[d][ourRank], 0);
if (ourRank && (ourRank == theirRank - 1))