X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpawns.cpp;h=718dd575957076d73e62b0bf47350619e826891c;hb=8c2fd2170a0d6dececbe87b0c0353ce718dcd9fd;hp=9a0059dcec379e7e64a3e20ad43525601aaa8f4d;hpb=9ca4359f3691305fc5e3306c3084c83557ce09c0;p=stockfish
diff --git a/src/pawns.cpp b/src/pawns.cpp
index 9a0059dc..718dd575 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -1,7 +1,7 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,233 +17,265 @@
along with this program. If not, see .
*/
-
-////
-//// Includes
-////
-
+#include
#include
-#include
+#include "bitboard.h"
#include "bitcount.h"
#include "pawns.h"
#include "position.h"
-
-////
-//// Local definitions
-////
-
namespace {
- /// Constants and variables
-
+ #define V Value
#define S(mg, eg) make_score(mg, eg)
- // Doubled pawn penalty by file
- const Score DoubledPawnPenalty[8] = {
- S(13, 43), S(20, 48), S(23, 48), S(23, 48),
- S(23, 48), S(23, 48), S(20, 48), S(13, 43)
- };
-
- // Isolated pawn penalty by file
- const Score IsolatedPawnPenalty[8] = {
- S(25, 30), S(36, 35), S(40, 35), S(40, 35),
- S(40, 35), S(40, 35), S(36, 35), S(25, 30)
- };
-
- // Backward pawn penalty by file
- const Score BackwardPawnPenalty[8] = {
- S(20, 28), S(29, 31), S(33, 31), S(33, 31),
- S(33, 31), S(33, 31), S(29, 31), S(20, 28)
- };
+ // Doubled pawn penalty by opposed flag and file
+ const Score Doubled[2][FILE_NB] = {
+ { S(13, 43), S(20, 48), S(23, 48), S(23, 48),
+ S(23, 48), S(23, 48), S(20, 48), S(13, 43) },
+ { S(13, 43), S(20, 48), S(23, 48), S(23, 48),
+ S(23, 48), S(23, 48), S(20, 48), S(13, 43) }};
+
+ // Isolated pawn penalty by opposed flag and file
+ const Score Isolated[2][FILE_NB] = {
+ { S(37, 45), S(54, 52), S(60, 52), S(60, 52),
+ S(60, 52), S(60, 52), S(54, 52), S(37, 45) },
+ { S(25, 30), S(36, 35), S(40, 35), S(40, 35),
+ S(40, 35), S(40, 35), S(36, 35), S(25, 30) }};
+
+ // Backward pawn penalty by opposed flag and file
+ const Score Backward[2][FILE_NB] = {
+ { S(30, 42), S(43, 46), S(49, 46), S(49, 46),
+ S(49, 46), S(49, 46), S(43, 46), S(30, 42) },
+ { S(20, 28), S(29, 31), S(33, 31), S(33, 31),
+ S(33, 31), S(33, 31), S(29, 31), S(20, 28) }};
// Pawn chain membership bonus by file
- const Score ChainBonus[8] = {
+ const Score ChainMember[FILE_NB] = {
S(11,-1), S(13,-1), S(13,-1), S(14,-1),
S(14,-1), S(13,-1), S(13,-1), S(11,-1)
};
// Candidate passed pawn bonus by rank
- const Score CandidateBonus[8] = {
+ const Score CandidatePassed[RANK_NB] = {
S( 0, 0), S( 6, 13), S(6,13), S(14,29),
S(34,68), S(83,166), S(0, 0), S( 0, 0)
};
- #undef S
-}
+ // Weakness of our pawn shelter in front of the king indexed by [rank]
+ const Value ShelterWeakness[RANK_NB] =
+ { V(100), V(0), V(27), V(73), V(92), V(101), V(101) };
+ // Danger of enemy pawns moving toward our king indexed by
+ // [no friendly pawn | pawn unblocked | pawn blocked][rank of enemy pawn]
+ const Value StormDanger[3][RANK_NB] = {
+ { V( 0), V(64), V(128), V(51), V(26) },
+ { V(26), V(32), V( 96), V(38), V(20) },
+ { V( 0), V( 0), V( 64), V(25), V(13) }};
-////
-//// Functions
-////
+ // Max bonus for king safety. Corresponds to start position with all the pawns
+ // in front of the king and no enemy pawn on the horizont.
+ const Value MaxSafetyBonus = V(263);
-/// PawnInfoTable c'tor and d'tor instantiated one each thread
+ #undef S
+ #undef V
+
+ template
+ Score evaluate(const Position& pos, Pawns::Entry* e) {
+
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
+ const Square Up = (Us == WHITE ? DELTA_N : DELTA_S);
+ const Square Right = (Us == WHITE ? DELTA_NE : DELTA_SW);
+ const Square Left = (Us == WHITE ? DELTA_NW : DELTA_SE);
+
+ Bitboard b;
+ Square s;
+ File f;
+ Rank r;
+ bool passed, isolated, doubled, opposed, chain, backward, candidate;
+ Score value = SCORE_ZERO;
+ const Square* pl = pos.list(Us);
+
+ Bitboard ourPawns = pos.pieces(Us, PAWN);
+ Bitboard theirPawns = pos.pieces(Them, PAWN);
+
+ e->passedPawns[Us] = 0;
+ e->kingSquares[Us] = SQ_NONE;
+ e->semiopenFiles[Us] = 0xFF;
+ e->pawnAttacks[Us] = shift_bb(ourPawns) | shift_bb(ourPawns);
+ e->pawnsOnSquares[Us][BLACK] = popcount(ourPawns & DarkSquares);
+ e->pawnsOnSquares[Us][WHITE] = pos.count(Us) - e->pawnsOnSquares[Us][BLACK];
+
+ // Loop through all pawns of the current color and score each pawn
+ while ((s = *pl++) != SQ_NONE)
+ {
+ assert(pos.piece_on(s) == make_piece(Us, PAWN));
+
+ f = file_of(s);
+ r = rank_of(s);
+
+ // This file cannot be semi-open
+ e->semiopenFiles[Us] &= ~(1 << f);
+
+ // Our rank plus previous one. Used for chain detection
+ b = rank_bb(r) | rank_bb(Us == WHITE ? r - Rank(1) : r + Rank(1));
+
+ // Flag the pawn as passed, isolated, doubled or member of a pawn
+ // chain (but not the backward one).
+ chain = ourPawns & adjacent_files_bb(f) & b;
+ isolated = !(ourPawns & adjacent_files_bb(f));
+ doubled = ourPawns & forward_bb(Us, s);
+ opposed = theirPawns & forward_bb(Us, s);
+ passed = !(theirPawns & passed_pawn_mask(Us, s));
+
+ // Test for backward pawn
+ backward = false;
+
+ // If the pawn is passed, isolated, or member of a pawn chain it cannot
+ // be backward. If there are friendly pawns behind on adjacent files
+ // or if can capture an enemy pawn it cannot be backward either.
+ if ( !(passed | isolated | chain)
+ && !(ourPawns & pawn_attack_span(Them, s))
+ && !(pos.attacks_from(s, Us) & theirPawns))
+ {
+ // We now know that there are no friendly pawns beside or behind this
+ // pawn on adjacent files. We now check whether the pawn is
+ // backward by looking in the forward direction on the adjacent
+ // files, and seeing whether we meet a friendly or an enemy pawn first.
+ b = pos.attacks_from(s, Us);
+
+ // Note that we are sure to find something because pawn is not passed
+ // nor isolated, so loop is potentially infinite, but it isn't.
+ while (!(b & (ourPawns | theirPawns)))
+ b = shift_bb(b);
+
+ // The friendly pawn needs to be at least two ranks closer than the
+ // enemy pawn in order to help the potentially backward pawn advance.
+ backward = (b | shift_bb(b)) & theirPawns;
+ }
+
+ assert(opposed | passed | (pawn_attack_span(Us, s) & theirPawns));
+
+ // A not passed pawn is a candidate to become passed if it is free to
+ // advance and if the number of friendly pawns beside or behind this
+ // pawn on adjacent files is higher or equal than the number of
+ // enemy pawns in the forward direction on the adjacent files.
+ candidate = !(opposed | passed | backward | isolated)
+ && (b = pawn_attack_span(Them, s + pawn_push(Us)) & ourPawns) != 0
+ && popcount(b) >= popcount(pawn_attack_span(Us, s) & theirPawns);
+
+ // Passed pawns will be properly scored in evaluation because we need
+ // full attack info to evaluate passed pawns. Only the frontmost passed
+ // pawn on each file is considered a true passed pawn.
+ if (passed && !doubled)
+ e->passedPawns[Us] |= s;
+
+ // Score this pawn
+ if (isolated)
+ value -= Isolated[opposed][f];
+
+ if (doubled)
+ value -= Doubled[opposed][f];
+
+ if (backward)
+ value -= Backward[opposed][f];
+
+ if (chain)
+ value += ChainMember[f];
+
+ if (candidate)
+ value += CandidatePassed[relative_rank(Us, s)];
+ }
+
+ return value;
+ }
-PawnInfoTable::PawnInfoTable() {
+} // namespace
- entries = new PawnInfo[PawnTableSize];
+namespace Pawns {
- if (!entries)
- {
- std::cerr << "Failed to allocate " << (PawnTableSize * sizeof(PawnInfo))
- << " bytes for pawn hash table." << std::endl;
- Application::exit_with_failure();
- }
- memset(entries, 0, PawnTableSize * sizeof(PawnInfo));
-}
+/// probe() takes a position object as input, computes a Entry object, and returns
+/// a pointer to it. The result is also stored in a hash table, so we don't have
+/// to recompute everything when the same pawn structure occurs again.
+Entry* probe(const Position& pos, Table& entries) {
-PawnInfoTable::~PawnInfoTable() {
+ Key key = pos.pawn_key();
+ Entry* e = entries[key];
- delete [] entries;
+ if (e->key == key)
+ return e;
+
+ e->key = key;
+ e->value = evaluate(pos, e) - evaluate(pos, e);
+ return e;
}
-/// PawnInfoTable::get_pawn_info() takes a position object as input, computes
-/// a PawnInfo object, and returns a pointer to it. The result is also stored
-/// in a hash table, so we don't have to recompute everything when the same
-/// pawn structure occurs again.
+/// Entry::shelter_storm() calculates shelter and storm penalties for the file
+/// the king is on, as well as the two adjacent files.
-PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) const {
+template
+Value Entry::shelter_storm(const Position& pos, Square ksq) {
- assert(pos.is_ok());
+ const Color Them = (Us == WHITE ? BLACK : WHITE);
- Key key = pos.get_pawn_key();
- unsigned index = unsigned(key & (PawnTableSize - 1));
- PawnInfo* pi = entries + index;
+ Value safety = MaxSafetyBonus;
+ Bitboard b = pos.pieces(PAWN) & (in_front_bb(Us, rank_of(ksq)) | rank_bb(ksq));
+ Bitboard ourPawns = b & pos.pieces(Us);
+ Bitboard theirPawns = b & pos.pieces(Them);
+ Rank rkUs, rkThem;
+ File kf = file_of(ksq);
- // If pi->key matches the position's pawn hash key, it means that we
- // have analysed this pawn structure before, and we can simply return
- // the information we found the last time instead of recomputing it.
- if (pi->key == key)
- return pi;
+ kf = (kf == FILE_A) ? FILE_B : (kf == FILE_H) ? FILE_G : kf;
- // Clear the PawnInfo object, and set the key
- memset(pi, 0, sizeof(PawnInfo));
- pi->kingSquares[WHITE] = pi->kingSquares[BLACK] = SQ_NONE;
- pi->key = key;
+ for (int f = kf - 1; f <= kf + 1; f++)
+ {
+ b = ourPawns & FileBB[f];
+ rkUs = b ? relative_rank(Us, Us == WHITE ? lsb(b) : msb(b)) : RANK_1;
+ safety -= ShelterWeakness[rkUs];
- // Calculate pawn attacks
- Bitboard whitePawns = pos.pieces(PAWN, WHITE);
- Bitboard blackPawns = pos.pieces(PAWN, BLACK);
- pi->pawnAttacks[WHITE] = ((whitePawns << 9) & ~FileABB) | ((whitePawns << 7) & ~FileHBB);
- pi->pawnAttacks[BLACK] = ((blackPawns >> 7) & ~FileABB) | ((blackPawns >> 9) & ~FileHBB);
+ b = theirPawns & FileBB[f];
+ rkThem = b ? relative_rank(Us, Us == WHITE ? lsb(b) : msb(b)) : RANK_1;
+ safety -= StormDanger[rkUs == RANK_1 ? 0 : rkThem == rkUs + 1 ? 2 : 1][rkThem];
+ }
- // Evaluate pawns for both colors
- pi->value = evaluate_pawns(pos, whitePawns, blackPawns, pi)
- - evaluate_pawns(pos, blackPawns, whitePawns, pi);
- return pi;
+ return safety;
}
-/// PawnInfoTable::evaluate_pawns() evaluates each pawn of the given color
+/// Entry::update_safety() calculates and caches a bonus for king safety. It is
+/// called only when king square changes, about 20% of total king_safety() calls.
template
-Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
- Bitboard theirPawns, PawnInfo* pi) const {
- Bitboard b;
- Square s;
- File f;
- Rank r;
- bool passed, isolated, doubled, opposed, chain, backward, candidate;
- Score value = SCORE_ZERO;
- const BitCountType Max15 = CpuIs64Bit ? CNT64_MAX15 : CNT32_MAX15;
- const Square* ptr = pos.piece_list_begin(Us, PAWN);
-
- // Initialize halfOpenFiles[]
- for (f = FILE_A; f <= FILE_H; f++)
- if (!(ourPawns & file_bb(f)))
- pi->halfOpenFiles[Us] |= (1 << f);
-
- // Loop through all pawns of the current color and score each pawn
- while ((s = *ptr++) != SQ_NONE)
- {
- assert(pos.piece_on(s) == piece_of_color_and_type(Us, PAWN));
-
- f = square_file(s);
- r = square_rank(s);
-
- // Our rank plus previous one. Used for chain detection.
- b = rank_bb(r) | rank_bb(Us == WHITE ? r - Rank(1) : r + Rank(1));
-
- // Passed, isolated, doubled or member of a pawn
- // chain (but not the backward one) ?
- passed = !(theirPawns & passed_pawn_mask(Us, s));
- doubled = ourPawns & squares_behind(Us, s);
- opposed = theirPawns & squares_in_front_of(Us, s);
- isolated = !(ourPawns & neighboring_files_bb(f));
- chain = ourPawns & neighboring_files_bb(f) & b;
-
- // Test for backward pawn
- //
- backward = false;
-
- // If the pawn is passed, isolated, or member of a pawn chain
- // it cannot be backward. If can capture an enemy pawn or if
- // there are friendly pawns behind on neighboring files it cannot
- // be backward either.
- if ( !(passed | isolated | chain)
- && !(ourPawns & attack_span_mask(opposite_color(Us), s))
- && !(pos.attacks_from(s, Us) & theirPawns))
- {
- // We now know that there are no friendly pawns beside or behind this
- // pawn on neighboring files. We now check whether the pawn is
- // backward by looking in the forward direction on the neighboring
- // files, and seeing whether we meet a friendly or an enemy pawn first.
- b = pos.attacks_from(s, Us);
-
- // Note that we are sure to find something because pawn is not passed
- // nor isolated, so loop is potentially infinite, but it isn't.
- while (!(b & (ourPawns | theirPawns)))
- Us == WHITE ? b <<= 8 : b >>= 8;
-
- // The friendly pawn needs to be at least two ranks closer than the enemy
- // pawn in order to help the potentially backward pawn advance.
- backward = (b | (Us == WHITE ? b << 8 : b >> 8)) & theirPawns;
- }
-
- assert(passed | opposed | (attack_span_mask(Us, s) & theirPawns));
-
- // Test for candidate passed pawn
- candidate = !(opposed | passed)
- && (b = attack_span_mask(opposite_color(Us), s + pawn_push(Us)) & ourPawns) != EmptyBoardBB
- && count_1s(b) >= count_1s(attack_span_mask(Us, s) & theirPawns);
-
- // In order to prevent doubled passed pawns from receiving a too big
- // bonus, only the frontmost passed pawn on each file is considered as
- // a true passed pawn.
- if (passed && (ourPawns & squares_in_front_of(Us, s)))
- passed = false;
-
- // Mark the pawn as passed. Pawn will be properly scored in evaluation
- // because we need full attack info to evaluate passed pawns.
- if (passed)
- set_bit(&(pi->passedPawns[Us]), s);
-
- // Score this pawn
- if (isolated)
- {
- value -= IsolatedPawnPenalty[f];
- if (!opposed)
- value -= IsolatedPawnPenalty[f] / 2;
- }
- if (doubled)
- value -= DoubledPawnPenalty[f];
-
- if (backward)
- {
- value -= BackwardPawnPenalty[f];
- if (!opposed)
- value -= BackwardPawnPenalty[f] / 2;
- }
- if (chain)
- value += ChainBonus[f];
-
- if (candidate)
- value += CandidateBonus[relative_rank(Us, s)];
- }
+Score Entry::update_safety(const Position& pos, Square ksq) {
- return value;
+ kingSquares[Us] = ksq;
+ castleRights[Us] = pos.can_castle(Us);
+ minKPdistance[Us] = 0;
+
+ Bitboard pawns = pos.pieces(Us, PAWN);
+ if (pawns)
+ while (!(DistanceRingsBB[ksq][minKPdistance[Us]++] & pawns)) {}
+
+ if (relative_rank(Us, ksq) > RANK_4)
+ return kingSafety[Us] = make_score(0, -16 * minKPdistance[Us]);
+
+ Value bonus = shelter_storm(pos, ksq);
+
+ // If we can castle use the bonus after the castle if is bigger
+ if (pos.can_castle(make_castle_right(Us, KING_SIDE)))
+ bonus = std::max(bonus, shelter_storm(pos, relative_square(Us, SQ_G1)));
+
+ if (pos.can_castle(make_castle_right(Us, QUEEN_SIDE)))
+ bonus = std::max(bonus, shelter_storm(pos, relative_square(Us, SQ_C1)));
+
+ return kingSafety[Us] = make_score(bonus, -16 * minKPdistance[Us]);
}
+// Explicit template instantiation
+template Score Entry::update_safety(const Position& pos, Square ksq);
+template Score Entry::update_safety(const Position& pos, Square ksq);
+
+} // namespace Pawns