kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-12 03:59:15 +00:00
Code Issues Releases Wiki Activity

Rank based threats

Browse source 
STC:
LLR: 2.95 (-2.94,2.94) [0.00,5.00]
Total: 19404 W: 3581 L: 3374 D: 12449

LTC:
LLR: 2.96 (-2.94,2.94) [0.00,5.00]
Total: 16204 W: 2194 L: 2023 D: 11987

Bench: 5757843
This commit is contained in:
mbootsector 2016-11-25 17:47:18 +01:00 • committed by Marco Costalba
parent 8ceb1ff53b
commit e7289465b9
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/evaluate.cpp
View file

@ -200,6 +200,7 @@ namespace {
const Score Unstoppable = S( 0, 20); const Score Unstoppable = S( 0, 20);
const Score PawnlessFlank = S(20, 80); const Score PawnlessFlank = S(20, 80);
const Score HinderPassedPawn = S( 7, 0); const Score HinderPassedPawn = S( 7, 0);
const Score ThreatByRank = S(16, 3);
// Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by // Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by
// a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only // a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only
@ -561,11 +562,21 @@ namespace {
{ {
b = (defended | weak) & (ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]); b = (defended | weak) & (ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP]);
while (b) while (b)
score += Threat[Minor][type_of(pos.piece_on(pop_lsb(&b)))]; {
Square s = pop_lsb(&b);
score += Threat[Minor][type_of(pos.piece_on(s))];
if (type_of(pos.piece_on(s)) != PAWN)
score += ThreatByRank * (int)relative_rank(Them, s);
}
b = (pos.pieces(Them, QUEEN) | weak) & ei.attackedBy[Us][ROOK]; b = (pos.pieces(Them, QUEEN) | weak) & ei.attackedBy[Us][ROOK];
while (b) while (b)
score += Threat[Rook ][type_of(pos.piece_on(pop_lsb(&b)))]; {
Square s = pop_lsb(&b);
score += Threat[Rook][type_of(pos.piece_on(s))];
if (type_of(pos.piece_on(s)) != PAWN)
score += ThreatByRank * (int)relative_rank(Them, s);
}
score += Hanging * popcount(weak & ~ei.attackedBy[Them][ALL_PIECES]); score += Hanging * popcount(weak & ~ei.attackedBy[Them][ALL_PIECES]);