Skip a couple of popcount in previous patch

And some little tidy up

No functional change.
This commit is contained in:
Marco Costalba
2013-04-19 09:41:28 +02:00
parent cc40d1c46a
commit f84f04742a
4 changed files with 11 additions and 11 deletions

View File

@@ -171,6 +171,9 @@ namespace {
// right to castle.
const Value TrappedRookPenalty = Value(180);
// Penalty for bishop with pawns on the same coloured squares
const Score BishopPawnsPenalty = make_score(8, 12);
// 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
// happen in Chess960 games.
@@ -584,7 +587,7 @@ Value do_evaluate(const Position& pos, Value& margin) {
// Penalty for bishop with same coloured pawns
if (Piece == BISHOP)
score -= make_score(8, 12) * ei.pi->same_colored_pawn_count(s, Us);
score -= BishopPawnsPenalty * ei.pi->pawns_on_same_color_squares(Us, s);
// Bishop and knight outposts squares
if ( (Piece == BISHOP || Piece == KNIGHT)