uint8_t BitCount8Bit[256];
// Function prototypes
- void evaluate_knight(const Position &p, Square s, Color us, EvalInfo &ei);
- void evaluate_bishop(const Position &p, Square s, Color us, EvalInfo &ei);
- void evaluate_rook(const Position &p, Square s, Color us, EvalInfo &ei);
- void evaluate_queen(const Position &p, Square s, Color us, EvalInfo &ei);
- void evaluate_king(const Position &p, Square s, Color us, EvalInfo &ei);
+ void evaluate_knight(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei);
+ void evaluate_bishop(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei);
+ void evaluate_rook(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei);
+ void evaluate_queen(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei);
+ void evaluate_king(const Position& p, Square s, Color us, EvalInfo& ei);
void evaluate_passed_pawns(const Position &pos, EvalInfo &ei);
void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us,
// Evaluate pieces
for (Color c = WHITE; c <= BLACK; c++)
{
+ Bitboard pinned = pos.pinned_pieces(c);
+
// Knights
for (int i = 0; i < pos.piece_count(c, KNIGHT); i++)
- evaluate_knight(pos, pos.piece_list(c, KNIGHT, i), c, ei);
+ evaluate_knight(pos, pos.piece_list(c, KNIGHT, i), c, pinned, ei);
// Bishops
for (int i = 0; i < pos.piece_count(c, BISHOP); i++)
- evaluate_bishop(pos, pos.piece_list(c, BISHOP, i), c, ei);
+ evaluate_bishop(pos, pos.piece_list(c, BISHOP, i), c, pinned, ei);
// Rooks
for (int i = 0; i < pos.piece_count(c, ROOK); i++)
- evaluate_rook(pos, pos.piece_list(c, ROOK, i), c, ei);
+ evaluate_rook(pos, pos.piece_list(c, ROOK, i), c, pinned, ei);
// Queens
for(int i = 0; i < pos.piece_count(c, QUEEN); i++)
- evaluate_queen(pos, pos.piece_list(c, QUEEN, i), c, ei);
+ evaluate_queen(pos, pos.piece_list(c, QUEEN, i), c, pinned, ei);
// Special pattern: trapped bishops on a7/h7/a2/h2
Bitboard b = pos.bishops(c) & MaskA7H7[c];
// evaluate_common() computes terms common to all pieces attack
template<PieceType Piece>
- int evaluate_common(const Position& p, const Bitboard& b, Color us, EvalInfo& ei, Square s = SQ_NONE) {
+ int evaluate_common(const Position& p, const Bitboard& b, Color us, Bitboard pinned, EvalInfo& ei, Square s = SQ_NONE) {
static const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight };
static const Value* MgBonus[] = { 0, 0, MidgameKnightMobilityBonus, MidgameBishopMobilityBonus, MidgameRookMobilityBonus, MidgameQueenMobilityBonus };
static const Value* EgBonus[] = { 0, 0, EndgameKnightMobilityBonus, EndgameBishopMobilityBonus, EndgameRookMobilityBonus, EndgameQueenMobilityBonus };
static const Value* OutpostBonus[] = { 0, 0, KnightOutpostBonus, BishopOutpostBonus, 0, 0 };
+ int mob;
Color them = opposite_color(us);
// Update attack info
ei.kingAdjacentZoneAttacksCount[us] += count_1s_max_15(bb);
}
- // Remove squares protected by enemy pawns
- Bitboard bb = (b & ~ei.attackedBy[them][PAWN]);
+ if (pinned && bit_is_set(pinned, s))
+ mob = 0;
+ else
+ {
+ // Remove squares protected by enemy pawns
+ Bitboard bb = (b & ~ei.attackedBy[them][PAWN]);
- // Mobility
- int mob = count_1s_max_15(bb & ~p.pieces_of_color(us));
- ei.mgMobility += Sign[us] * MgBonus[Piece][mob];
- ei.egMobility += Sign[us] * EgBonus[Piece][mob];
+ // Mobility
+ mob = (Piece != QUEEN ? count_1s_max_15(bb & ~p.pieces_of_color(us))
+ : count_1s(bb & ~p.pieces_of_color(us)));
+
+ ei.mgMobility += Sign[us] * MgBonus[Piece][mob];
+ ei.egMobility += Sign[us] * EgBonus[Piece][mob];
+ }
// Bishop and Knight outposts
if ( (Piece != BISHOP && Piece != KNIGHT) // compile time condition
// evaluate_knight() assigns bonuses and penalties to a knight of a given
// color on a given square.
- void evaluate_knight(const Position& p, Square s, Color us, EvalInfo& ei) {
+ void evaluate_knight(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei) {
// Attacks, mobility and outposts
- evaluate_common<KNIGHT>(p, p.piece_attacks<KNIGHT>(s), us, ei, s);
+ evaluate_common<KNIGHT>(p, p.piece_attacks<KNIGHT>(s), us, pinned, ei, s);
}
// evaluate_bishop() assigns bonuses and penalties to a bishop of a given
// color on a given square.
- void evaluate_bishop(const Position& p, Square s, Color us, EvalInfo& ei) {
+ void evaluate_bishop(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei) {
Bitboard b = bishop_attacks_bb(s, p.occupied_squares() & ~p.queens(us));
// Attacks, mobility and outposts
- evaluate_common<BISHOP>(p, b, us, ei, s);
+ evaluate_common<BISHOP>(p, b, us, pinned, ei, s);
}
// evaluate_rook() assigns bonuses and penalties to a rook of a given
// color on a given square.
- void evaluate_rook(const Position& p, Square s, Color us, EvalInfo& ei) {
+ void evaluate_rook(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei) {
Bitboard b = rook_attacks_bb(s, p.occupied_squares() & ~p.rooks_and_queens(us));
// Attacks and mobility
- int mob = evaluate_common<ROOK>(p, b, us, ei);
+ int mob = evaluate_common<ROOK>(p, b, us, pinned, ei);
// Rook on 7th rank
Color them = opposite_color(us);
// evaluate_queen() assigns bonuses and penalties to a queen of a given
// color on a given square.
- void evaluate_queen(const Position& p, Square s, Color us, EvalInfo& ei) {
+ void evaluate_queen(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei) {
// Attacks and mobility
- evaluate_common<QUEEN>(p, p.piece_attacks<QUEEN>(s), us, ei);
+ evaluate_common<QUEEN>(p, p.piece_attacks<QUEEN>(s), us, pinned, ei);
// Queen on 7th rank
Color them = opposite_color(us);
{
Square s = pop_1st_bit(&b);
- assert(pos.piece_on(s) == pawn_of_color(us));
+ assert(pos.piece_on(s) == piece_of_color_and_type(us, PAWN));
assert(pos.pawn_is_passed(us, s));
int r = int(relative_rank(us, s) - RANK_2);
void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us,
EvalInfo &ei) {
assert(square_is_ok(s));
- assert(pos.piece_on(s) == bishop_of_color(us));
+ assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP));
Square b6 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B6 : SQ_G6);
Square b8 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B8 : SQ_G8);
- if ( pos.piece_on(b6) == pawn_of_color(opposite_color(us))
+ if ( pos.piece_on(b6) == piece_of_color_and_type(opposite_color(us), PAWN)
&& pos.see(s, b6) < 0
&& pos.see(s, b8) < 0)
{
void evaluate_trapped_bishop_a1h1(const Position &pos, Square s, Color us,
EvalInfo &ei) {
- Piece pawn = pawn_of_color(us);
+ Piece pawn = piece_of_color_and_type(us, PAWN);
Square b2, b3, c3;
assert(Chess960);
assert(square_is_ok(s));
- assert(pos.piece_on(s) == bishop_of_color(us));
+ assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP));
if (square_file(s) == FILE_A)
{