HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-21 01:27:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Penalize hanging pieces

Browse Source 
Passed both STC
LLR: 2.95 (-2.94,2.94) [-1.50,4.50]
Total: 8519 W: 1565 L: 1440 D: 5514

And LTC
LLR: 2.95 (-2.94,2.94) [0.00,6.00]
Total: 60618 W: 9141 L: 8777 D: 42700

bench: 8678654
This commit is contained in:
snicolet
2014-04-27 01:35:46 +02:00
committed by Marco Costalba
parent db229504e2
commit d3ffd0ffca
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/evaluate.cpp
View File

@@ -158,6 +158,9 @@ namespace {
S(0, 0), S(0, 0), S(56, 70), S(56, 70), S(76, 99), S(86, 118) S(0, 0), S(0, 0), S(56, 70), S(56, 70), S(76, 99), S(86, 118)
}; };
// Hanging[side to move] contains a bonus for each enemy hanging piece
const Score Hanging[2] = { S(23, 20) , S(35, 45) };
#undef S #undef S
const Score Tempo = make_score(24, 11); const Score Tempo = make_score(24, 11);
@@ -527,7 +530,7 @@ namespace {
if (undefendedMinors) if (undefendedMinors)
score += UndefendedMinor; score += UndefendedMinor;
// Enemy pieces not defended by a pawn and under our attack // Enemies not defended by a pawn and under our attack
weakEnemies = pos.pieces(Them) weakEnemies = pos.pieces(Them)
& ~ei.attackedBy[Them][PAWN] & ~ei.attackedBy[Them][PAWN]
& ei.attackedBy[Us][ALL_PIECES]; & ei.attackedBy[Us][ALL_PIECES];
@@ -535,13 +538,18 @@ namespace {
// Add a bonus according if the attacking pieces are minor or major // Add a bonus according if the attacking pieces are minor or major
if (weakEnemies) if (weakEnemies)
{ {
b = weakEnemies & (ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]); b = weakEnemies & (ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]);
if (b) if (b)
score += Threat[0][type_of(pos.piece_on(lsb(b)))]; score += Threat[0][type_of(pos.piece_on(lsb(b)))];
b = weakEnemies & (ei.attackedBy[Us][ROOK] | ei.attackedBy[Us][QUEEN]); b = weakEnemies & (ei.attackedBy[Us][ROOK] | ei.attackedBy[Us][QUEEN]);
if (b) if (b)
score += Threat[1][type_of(pos.piece_on(lsb(b)))]; score += Threat[1][type_of(pos.piece_on(lsb(b)))];
b = weakEnemies & ~ei.attackedBy[Them][ALL_PIECES];
if (b)
score += more_than_one(b) ? Hanging[Us != pos.side_to_move()] * popcount<Max15>(b)
: Hanging[Us == pos.side_to_move()];
} }
if (Trace) if (Trace)