kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 09:13:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #9 from glinscott/master

Browse source 
Penalty for undefended rook

Almost no change at longer TC, but perhaps there
is a tiny increase....

After 17522 games at 10"+0.05
Mod vs Orig 3064 - 2967 - 11491 ELO +2

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2012-03-26 11:55:32 -07:00
commit a56322fde8
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/evaluate.cpp
View file

@ -167,8 +167,8 @@ 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 // Penalty for BNR that is not defended by anything
const Score UndefendedMinorPenalty = make_score(25, 10); const Score UndefendedPiecePenalty = 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
@ -678,21 +678,24 @@ Value do_evaluate(const Position& pos, Value& margin) {
const Color Them = (Us == WHITE ? BLACK : WHITE); const Color Them = (Us == WHITE ? BLACK : WHITE);
Bitboard b; Bitboard b, undefended, undefendedMinors, weakEnemies;
Score score = SCORE_ZERO; Score score = SCORE_ZERO;
// Undefended minors get penalized even if not under attack // Undefended pieces get penalized even if not under attack
Bitboard undefended = pos.pieces(Them) undefended = pos.pieces(Them) & ~ei.attackedBy[Them][0];
& (pos.pieces(BISHOP) | pos.pieces(KNIGHT)) undefendedMinors = undefended & (pos.pieces(BISHOP) | pos.pieces(KNIGHT));
& ~ei.attackedBy[Them][0];
if (undefended) if (undefendedMinors)
score += single_bit(undefended) ? UndefendedMinorPenalty score += single_bit(undefendedMinors) ? UndefendedPiecePenalty
: UndefendedMinorPenalty * 2; : UndefendedPiecePenalty * 2;
if (undefended & pos.pieces(ROOK))
score += UndefendedPiecePenalty;
// 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) 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;