mirror of
https://github.com/HChaZZY/Stockfish.git
synced 2025-12-20 00:56:39 +08:00
Optimize undefended minor check.
This commit is contained in:
@@ -167,6 +167,9 @@ namespace {
|
|||||||
// happen in Chess960 games.
|
// happen in Chess960 games.
|
||||||
const Score TrappedBishopA1H1Penalty = make_score(100, 100);
|
const Score TrappedBishopA1H1Penalty = make_score(100, 100);
|
||||||
|
|
||||||
|
// Penalty for a minor piece that is not defended by anything
|
||||||
|
const Score UndefendedMinorPenalty = make_score(25, 10);
|
||||||
|
|
||||||
// The SpaceMask[Color] contains the area of the board which is considered
|
// The SpaceMask[Color] contains the area of the board which is considered
|
||||||
// by the space evaluation. In the middle game, each side is given a bonus
|
// by the space evaluation. In the middle game, each side is given a bonus
|
||||||
// based on how many squares inside this area are safe and available for
|
// based on how many squares inside this area are safe and available for
|
||||||
@@ -680,16 +683,19 @@ Value do_evaluate(const Position& pos, Value& margin) {
|
|||||||
Score score = SCORE_ZERO;
|
Score score = SCORE_ZERO;
|
||||||
|
|
||||||
// Undefended minors get penalized even if not under attack
|
// Undefended minors get penalized even if not under attack
|
||||||
Bitboard undefended = pos.pieces(Them)
|
const Bitboard undefended = pos.pieces(Them)
|
||||||
& (pos.pieces(BISHOP) | pos.pieces(KNIGHT))
|
& (pos.pieces(BISHOP) | pos.pieces(KNIGHT))
|
||||||
& ~ei.attackedBy[Them][0];
|
& ~ei.attackedBy[Them][0];
|
||||||
if (undefended)
|
if (undefended) {
|
||||||
score += make_score(25, 10) * popcount<Max15>(undefended);
|
score += UndefendedMinorPenalty;
|
||||||
|
if (!single_bit(undefended))
|
||||||
|
score += UndefendedMinorPenalty;
|
||||||
|
}
|
||||||
|
|
||||||
// Enemy pieces not defended by a pawn and under our attack
|
// Enemy pieces not defended by a pawn and under our attack
|
||||||
Bitboard weakEnemies = pos.pieces(Them)
|
const Bitboard weakEnemies = pos.pieces(Them)
|
||||||
& ~ei.attackedBy[Them][PAWN]
|
& ~ei.attackedBy[Them][PAWN]
|
||||||
& ei.attackedBy[Us][0];
|
& ei.attackedBy[Us][0];
|
||||||
if (!weakEnemies)
|
if (!weakEnemies)
|
||||||
return score;
|
return score;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user