1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00

Merge pull request #8 from glinscott/master

Optimize undefended minor check. Little editing by
me, no change even at assembly level.

No regression after 8K games at fast TC on a 64bit CPU.
This commit is contained in:
mcostalba 2012-03-21 23:39:53 -07:00 committed by Marco Costalba
commit d4c9abb967

View file

@ -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
@ -684,7 +687,8 @@ Value do_evaluate(const Position& pos, Value& margin) {
& (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 += single_bit(undefended) ? UndefendedMinorPenalty
: UndefendedMinorPenalty * 2;
// 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) Bitboard weakEnemies = pos.pieces(Them)