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

Revert "Penalty for undefended rook"

Browse source 
After extensive test Gary says:

"So, after 16k games at 10"+1" on an i7, the undefended rook test
looks to be not good (albeit by a very small margin).
3063 - 3093 - 9844 (-1).

I doubt that is causing the regression, but even so, it looks like
it's not worth keeping, and we can go back to the simpler undefended
minors check."

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2012-04-07 11:34:22 +01:00
parent 676b2c8435
commit f30f384757
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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