S( 94, 99), S( 96,100), S(99,111), S(99,112) }
};
- // Outpost[Bishop/Knight][Square] contains bonuses for knights and bishops
- // outposts, indexed by piece type and square (from white's point of view).
- const Value Outpost[][SQUARE_NB] = {
- {// A B C D E F G H
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Knights
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0),
- V(0), V(0), V(3), V(9), V(9), V(3), V(0), V(0),
- V(0), V(4),V(18),V(25),V(25),V(18), V(4), V(0),
- V(4), V(9),V(29),V(38),V(38),V(29), V(9), V(4),
- V(2), V(9),V(19),V(15),V(15),V(19), V(9), V(2) },
- {
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Bishops
- V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0),
- V(2), V(4), V(3), V(8), V(8), V(3), V(4), V(2),
- V(1), V(9), V(9),V(13),V(13), V(9), V(9), V(1),
- V(2), V(8),V(21),V(24),V(24),V(21), V(8), V(2),
- V(0), V(4), V(6), V(6), V(6), V(6), V(4), V(0) }
+ // Outpost[knight/bishop][supported by pawn] contains bonuses for knights and bishops
+ // outposts, bigger if outpost piece is supported by a pawn.
+ const Score Outpost[][2] = {
+ { S(28, 7), S(42,11) }, // Knights
+ { S(12, 3), S(18, 5) } // Bishops
};
// Threat[defended/weak][minor/major attacking][attacked PieceType] contains
ei.pinnedPieces[Us] = pos.pinned_pieces(Us);
ei.attackedBy[Us][ALL_PIECES] = ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us);
- Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from<KING>(pos.king_square(Them));
+ Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from<KING>(pos.square<KING>(Them));
// Init king safety tables only if we are going to use them
if (pos.non_pawn_material(Us) >= QueenValueMg)
}
- // evaluate_outpost() evaluates bishop and knight outpost squares
-
- template<PieceType Pt, Color Us>
- Score evaluate_outpost(const Position& pos, const EvalInfo& ei, Square s) {
-
- const Color Them = (Us == WHITE ? BLACK : WHITE);
-
- assert (Pt == BISHOP || Pt == KNIGHT);
-
- // Initial bonus based on square
- Value bonus = Outpost[Pt == BISHOP][relative_square(Us, s)];
-
- // Increase bonus if supported by pawn, especially if the opponent has
- // no minor piece which can trade with the outpost piece.
- if (bonus && (ei.attackedBy[Us][PAWN] & s))
- {
- if ( !pos.pieces(Them, KNIGHT)
- && !(squares_of_color(s) & pos.pieces(Them, BISHOP)))
- bonus += bonus + bonus / 2;
- else
- bonus += bonus / 2;
- }
-
- return make_score(bonus * 2, bonus / 2);
- }
-
-
// evaluate_pieces() assigns bonuses and penalties to the pieces of a given color
template<PieceType Pt, Color Us, bool Trace>
const PieceType NextPt = (Us == WHITE ? Pt : PieceType(Pt + 1));
const Color Them = (Us == WHITE ? BLACK : WHITE);
- const Square* pl = pos.
list<Pt>(Us);
+ const Square* pl = pos.
squares<Pt>(Us);
ei.attackedBy[Us][Pt] = 0;
: pos.attacks_from<Pt>(s);
if (ei.pinnedPieces[Us] & s)
- b &= LineBB[pos.king_square(Us)][s];
+ b &= LineBB[pos.square<KING>(Us)][s];
ei.attackedBy[Us][ALL_PIECES] |= ei.attackedBy[Us][Pt] |= b;
if (Pt == BISHOP || Pt == KNIGHT)
{
// Bonus for outpost square
- if (!(pos.pieces(Them, PAWN) & pawn_attack_span(Us, s)))
- score += evaluate_outpost<Pt, Us>(pos, ei, s);
+ if ( relative_rank(Us, s) >= RANK_4
+ && !(pos.pieces(Them, PAWN) & pawn_attack_span(Us, s)))
+ score += Outpost[Pt == BISHOP][!!(ei.attackedBy[Us][PAWN] & s)];
// Bonus when behind a pawn
if ( relative_rank(Us, s) < RANK_5
// Penalize when trapped by the king, even more if king cannot castle
if (mob <= 3 && !ei.pi->semiopen_file(Us, file_of(s)))
{
- Square ksq = pos.king_square(Us);
+ Square ksq = pos.square<KING>(Us);
if ( ((file_of(ksq) < FILE_E) == (file_of(s) < file_of(ksq)))
&& (rank_of(ksq) == rank_of(s) || relative_rank(Us, ksq) == RANK_1)
Bitboard undefended, b, b1, b2, safe;
int attackUnits;
- const Square ksq = pos.king_square(Us);
+ const Square ksq = pos.square<KING>(Us);
// King shelter and enemy pawns storm
Score score = ei.pi->king_safety<Us>(pos, ksq);
{
// ...and then remove squares not supported by another enemy piece
b &= ( ei.attackedBy[Them][PAWN] | ei.attackedBy[Them][KNIGHT]
- | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][QUEEN]);
+ | ei.attackedBy[Them][BISHOP]);
if (b)
attackUnits += RookContactCheck * popcount<Max15>(b);
enum { Defended, Weak };
enum { Minor, Major };
- Bitboard b, weak, defended, safe_pawns, safe_pawn_threats, unsafe_pawn_threats;
+ Bitboard b, weak, defended, safeThreats;
Score score = SCORE_ZERO;
- // Pawn Threats
- b = ei.attackedBy[Us][PAWN] & (pos.pieces(Them) ^ pos.pieces(Them, PAWN));
+ // Non-pawn enemies attacked by a pawn
+ weak = (pos.pieces(Them) ^ pos.pieces(Them, PAWN)) & ei.attackedBy[Us][PAWN];
- if (b)
+ if (weak)
{
- safe_pawns = pos.pieces(Us, PAWN) & (~ei.attackedBy[Them][ALL_PIECES] | ei.attackedBy[Us][ALL_PIECES]);
- safe_pawn_threats = (shift_bb<Right>(safe_pawns) | shift_bb<Left>(safe_pawns)) & (pos.pieces(Them) ^ pos.pieces(Them, PAWN));
- unsafe_pawn_threats = b ^ safe_pawn_threats;
+ b = pos.pieces(Us, PAWN) & ( ~ei.attackedBy[Them][ALL_PIECES]
+ | ei.attackedBy[Us][ALL_PIECES]);
- // Unsafe pawn threats
- if (unsafe_pawn_threats)
+ safeThreats = (shift_bb<Right>(b) | shift_bb<Left>(b)) & weak;
+
+ if (weak ^ safeThreats)
score += ThreatenedByHangingPawn;
- // Evaluate safe pawn threats
- while (safe_pawn_threats)
- score += ThreatenedByPawn[type_of(pos.piece_on(pop_lsb(&safe_pawn_threats)))];
+ while (safeThreats)
+ score += ThreatenedByPawn[type_of(pos.piece_on(pop_lsb(&safeThreats)))];
}
// Non-pawn enemies defended by a pawn
Square blockSq = s + pawn_push(Us);
// Adjust bonus based on the king's proximity
- ebonus += distance(pos.king_square(Them), blockSq) * 5 * rr
- - distance(pos.king_square(Us ), blockSq) * 2 * rr;
+ ebonus += distance(pos.square<KING>(Them), blockSq) * 5 * rr
+ - distance(pos.square<KING>(Us ), blockSq) * 2 * rr;
// If blockSq is not the queening square then consider also a second push
if (relative_rank(Us, blockSq) != RANK_8)
- ebonus -= distance(pos.king_square(Us), blockSq + pawn_push(Us)) * rr;
+ ebonus -= distance(pos.square<KING>(Us), blockSq + pawn_push(Us)) * rr;
// If the pawn is free to advance, then increase the bonus
if (pos.empty(blockSq))
ei.attackedBy[WHITE][ALL_PIECES] |= ei.attackedBy[WHITE][KING];
ei.attackedBy[BLACK][ALL_PIECES] |= ei.attackedBy[BLACK][KING];
- // Do not include in mobility squares protected by enemy pawns or occupied by our pawns or king
- Bitboard mobilityArea[] = { ~(ei.attackedBy[BLACK][PAWN] | pos.pieces(WHITE, PAWN, KING)),
- ~(ei.attackedBy[WHITE][PAWN] | pos.pieces(BLACK, PAWN, KING)) };
+ // Pawns blocked or on ranks 2 and 3. Will be excluded from the mobility area
+ Bitboard blockedPawns[] = {
+ pos.pieces(WHITE, PAWN) & (shift_bb<DELTA_S>(pos.pieces()) | Rank2BB | Rank3BB),
+ pos.pieces(BLACK, PAWN) & (shift_bb<DELTA_N>(pos.pieces()) | Rank7BB | Rank6BB)
+ };
+
+ // Do not include in mobility squares protected by enemy pawns, or occupied
+ // by our blocked pawns or king.
+ Bitboard mobilityArea[] = {
+ ~(ei.attackedBy[BLACK][PAWN] | blockedPawns[WHITE] | pos.square<KING>(WHITE)),
+ ~(ei.attackedBy[WHITE][PAWN] | blockedPawns[BLACK] | pos.square<KING>(BLACK))
+ };
// Evaluate pieces and mobility
score += evaluate_pieces<KNIGHT, WHITE, Trace>(pos, ei, mobility, mobilityArea);
// pawns are drawish.
else if ( abs(eg_value(score)) <= BishopValueEg
&& ei.pi->pawn_span(strongSide) <= 1
- && !pos.pawn_passed(~strongSide, pos.king_square(~strongSide)))
+ && !pos.pawn_passed(~strongSide, pos.square<KING>(~strongSide)))
sf = ei.pi->pawn_span(strongSide) ? ScaleFactor(56) : ScaleFactor(38);
}
projects / stockfish / blobdiff