#undef S
+ // Threats weights indexed by sente (side to move has a bigger weight)
+ const int ConcurrentThreatsWeight[2] = { 3, 15 };
+ const int ThreatsWeight[2] = { 249, 267 };
+
// Bonus for unstoppable passed pawns
const Value UnstoppablePawnValue = Value(0x500);
const Color Them = (Us == WHITE ? BLACK : WHITE);
Bitboard b;
+ Value mg, eg;
+ int sente, threatCount = 0;
Score bonus = make_score(0, 0);
// Enemy pieces not defended by a pawn and under our attack
if (b)
for (PieceType pt2 = PAWN; pt2 < KING; pt2++)
if (b & pos.pieces(pt2))
+ {
bonus += ThreatBonus[pt1][pt2];
+ threatCount++;
+ }
}
- ei.value += Sign[Us] * bonus;
+
+ sente = (Us == pos.side_to_move());
+
+ // Non linear threat evaluation. Increase threats score according to the
+ // number of concurrent threats and to the side to move.
+ mg = (mg_value(bonus) + mg_value(bonus) * ConcurrentThreatsWeight[sente] * threatCount / 256) * ThreatsWeight[sente] / 256;
+ eg = (eg_value(bonus) + eg_value(bonus) * ConcurrentThreatsWeight[sente] * threatCount / 256) * ThreatsWeight[sente] / 256;
+
+ ei.value += Sign[Us] * make_score(mg, eg);
}
{
Square s = pop_1st_bit(&b);
- assert(pos.piece_on(s) == piece_of_color_and_type(Us, PAWN));
assert(pos.pawn_is_passed(Us, s));
int r = int(relative_rank(Us, s) - RANK_2);
Square s = pop_1st_bit(&b);
Square queeningSquare = relative_square(c, make_square(square_file(s), RANK_8));
int d = square_distance(s, queeningSquare)
+ - (relative_rank(c, s) == RANK_2) // Double pawn push
- square_distance(pos.king_square(opposite_color(c)), queeningSquare)
+ int(c != pos.side_to_move());