X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpawns.cpp;h=8141df89216d3ceb5b88956b5a7dfa6db5265d25;hb=cb4bda0f4974c75733c41b15bff7624a65e6cee1;hp=d05e8af0cd3cf6783410339c3bfff14ca5bf059a;hpb=5ea984ac3515946d952bd3c9cfe8e8baef7cc85d;p=stockfish
diff --git a/src/pawns.cpp b/src/pawns.cpp
index d05e8af0..ca9c3023 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -1,7 +1,8 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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,64 +18,57 @@
along with this program. If not, see .
*/
+#include
#include
#include "bitboard.h"
-#include "bitcount.h"
#include "pawns.h"
#include "position.h"
+#include "thread.h"
namespace {
#define V Value
#define S(mg, eg) make_score(mg, eg)
- // 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 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)
- };
+ // Isolated pawn penalty
+ constexpr Score Isolated = S(13, 18);
- // Candidate passed pawn bonus by rank
- 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)
- };
+ // Backward pawn penalty
+ constexpr Score Backward = S(24, 12);
- // Weakness of our pawn shelter in front of the king indexed by [king pawn][rank]
- const Value ShelterWeakness[2][RANK_NB] =
- { { V(141), V(0), V(38), V(102), V(128), V(141), V(141) },
- { V( 61), V(0), V(16), V( 44), V( 56), V( 61), V( 61) } };
+ // Connected pawn bonus by opposed, phalanx, #support and rank
+ Score Connected[2][2][3][RANK_NB];
- // Danger of enemy pawns moving toward our king indexed by [pawn blocked][rank]
- const Value StormDanger[2][RANK_NB] =
- { { V(26), V(0), V(128), V(51), V(26) },
- { V(13), V(0), V( 64), V(25), V(13) } };
+ // Doubled pawn penalty
+ constexpr Score Doubled = S(18, 38);
- // 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);
+ // Strength of pawn shelter for our king by [distance from edge][rank].
+ // RANK_1 = 0 is used for files where we have no pawn, or pawn is behind our king.
+ constexpr Value ShelterStrength[int(FILE_NB) / 2][RANK_NB] = {
+ { V( -9), V(64), V(77), V( 44), V( 4), V( -1), V(-11) },
+ { V(-15), V(83), V(51), V(-10), V( 1), V(-10), V(-28) },
+ { V(-18), V(84), V(27), V(-12), V(21), V( -7), V(-36) },
+ { V( 12), V(79), V(25), V( 19), V( 9), V( -6), V(-33) }
+ };
+
+ // Danger of enemy pawns moving toward our king by [type][distance from edge][rank].
+ // For the unopposed and unblocked cases, RANK_1 = 0 is used when opponent has
+ // no pawn on the given file, or their pawn is behind our king.
+ constexpr Value StormDanger[][4][RANK_NB] = {
+ { { V( 4), V( 73), V( 132), V(46), V(31) }, // Unopposed
+ { V( 1), V( 64), V( 143), V(26), V(13) },
+ { V( 1), V( 47), V( 110), V(44), V(24) },
+ { V( 0), V( 72), V( 127), V(50), V(31) } },
+ { { V( 0), V( 0), V( 19), V(23), V( 1) }, // BlockedByPawn
+ { V( 0), V( 0), V( 88), V(27), V( 2) },
+ { V( 0), V( 0), V( 101), V(16), V( 1) },
+ { V( 0), V( 0), V( 111), V(22), V(15) } },
+ { { V(22), V( 45), V( 104), V(62), V( 6) }, // Unblocked
+ { V(31), V( 30), V( 99), V(39), V(19) },
+ { V(23), V( 29), V( 96), V(41), V(15) },
+ { V(21), V( 23), V( 116), V(41), V(15) } }
+ };
#undef S
#undef V
@@ -82,200 +76,204 @@ namespace {
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);
+ constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
+ constexpr Direction Up = (Us == WHITE ? NORTH : SOUTH);
- Bitboard b;
+ Bitboard b, neighbours, stoppers, doubled, supported, phalanx;
+ Bitboard lever, leverPush;
Square s;
- File f;
- Rank r;
- bool passed, isolated, doubled, opposed, chain, backward, candidate;
- Score value = SCORE_ZERO;
- const Square* pl = pos.piece_list(Us, PAWN);
+ bool opposed, backward;
+ Score score = SCORE_ZERO;
+ const Square* pl = pos.squares(Us);
- Bitboard ourPawns = pos.pieces(Us, PAWN);
+ Bitboard ourPawns = pos.pieces( Us, PAWN);
Bitboard theirPawns = pos.pieces(Them, PAWN);
- e->passedPawns[Us] = 0;
- e->kingSquares[Us] = SQ_NONE;
+ e->passedPawns[Us] = e->pawnAttacksSpan[Us] = e->weakUnopposed[Us] = 0;
e->semiopenFiles[Us] = 0xFF;
- e->pawnAttacks[Us] = shift_bb(ourPawns) | shift_bb(ourPawns);
- e->pawnsOnSquares[Us][BLACK] = popcount(ourPawns & BlackSquares);
- e->pawnsOnSquares[Us][WHITE] = pos.piece_count(Us, PAWN) - e->pawnsOnSquares[Us][BLACK];
+ e->kingSquares[Us] = SQ_NONE;
+ e->pawnAttacks[Us] = pawn_attacks_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);
+ File f = file_of(s);
- // This file cannot be semi-open
- e->semiopenFiles[Us] &= ~(1 << f);
+ e->semiopenFiles[Us] &= ~(1 << f);
+ e->pawnAttacksSpan[Us] |= pawn_attack_span(Us, s);
- // 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
+ opposed = theirPawns & forward_file_bb(Us, s);
+ stoppers = theirPawns & passed_pawn_mask(Us, s);
+ lever = theirPawns & PawnAttacks[Us][s];
+ leverPush = theirPawns & PawnAttacks[Us][s + Up];
+ doubled = ourPawns & (s - Up);
+ neighbours = ourPawns & adjacent_files_bb(f);
+ phalanx = neighbours & rank_bb(s);
+ supported = neighbours & rank_bb(s - Up);
- // 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));
+ // A pawn is backward when it is behind all pawns of the same color
+ // on the adjacent files and cannot be safely advanced.
+ backward = !lever && !(ourPawns & pawn_attack_span(Them, s + Up))
+ && (stoppers & (leverPush | (s + Up)));
- // Test for backward pawn
- backward = false;
+ // Passed pawns will be properly scored in evaluation because we need
+ // full attack info to evaluate them. Include also not passed pawns
+ // which could become passed after one or two pawn pushes when are
+ // not attacked more times than defended.
+ if ( !(stoppers ^ lever ^ leverPush)
+ && !(ourPawns & forward_file_bb(Us, s))
+ && popcount(supported) >= popcount(lever) - 1
+ && popcount(phalanx) >= popcount(leverPush))
+ e->passedPawns[Us] |= s;
- // 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 & attack_span_mask(Them, s))
- && !(pos.attacks_from(s, Us) & theirPawns))
+ else if ( stoppers == SquareBB[s + Up]
+ && relative_rank(Us, s) >= RANK_5)
{
- // 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;
+ b = shift(supported) & ~theirPawns;
+ while (b)
+ if (!more_than_one(theirPawns & PawnAttacks[Us][pop_lsb(&b)]))
+ e->passedPawns[Us] |= s;
}
- assert(opposed | passed | (attack_span_mask(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 = attack_span_mask(Them, s + pawn_push(Us)) & ourPawns) != 0
- && popcount(b) >= popcount(attack_span_mask(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 (supported | phalanx)
+ score += Connected[opposed][bool(phalanx)][popcount(supported)][relative_rank(Us, s)];
- if (backward)
- value -= Backward[opposed][f];
+ else if (!neighbours)
+ score -= Isolated, e->weakUnopposed[Us] += !opposed;
- if (chain)
- value += ChainMember[f];
+ else if (backward)
+ score -= Backward, e->weakUnopposed[Us] += !opposed;
- if (candidate)
- value += CandidatePassed[relative_rank(Us, s)];
+ if (doubled && !supported)
+ score -= Doubled;
}
- return value;
+ return score;
}
} // namespace
namespace Pawns {
-/// 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.
+/// Pawns::init() initializes some tables needed by evaluation. Instead of using
+/// hard-coded tables, when makes sense, we prefer to calculate them with a formula
+/// to reduce independent parameters and to allow easier tuning and better insight.
+
+void init() {
-Entry* probe(const Position& pos, Table& entries) {
+ static constexpr int Seed[RANK_NB] = { 0, 13, 24, 18, 65, 100, 175, 330 };
+
+ for (int opposed = 0; opposed <= 1; ++opposed)
+ for (int phalanx = 0; phalanx <= 1; ++phalanx)
+ for (int support = 0; support <= 2; ++support)
+ for (Rank r = RANK_2; r < RANK_8; ++r)
+ {
+ int v = 17 * support;
+ v += (Seed[r] + (phalanx ? (Seed[r + 1] - Seed[r]) / 2 : 0)) >> opposed;
+
+ Connected[opposed][phalanx][support][r] = make_score(v, v * (r - 2) / 4);
+ }
+}
+
+
+/// Pawns::probe() looks up the current position's pawns configuration in
+/// the pawns hash table. It returns a pointer to the Entry if the position
+/// is found. Otherwise a new Entry is computed and stored there, so we don't
+/// have to recompute all when the same pawns configuration occurs again.
+
+Entry* probe(const Position& pos) {
Key key = pos.pawn_key();
- Entry* e = entries[key];
+ Entry* e = pos.this_thread()->pawnsTable[key];
if (e->key == key)
return e;
e->key = key;
- e->value = evaluate(pos, e) - evaluate(pos, e);
+ e->scores[WHITE] = evaluate(pos, e);
+ e->scores[BLACK] = evaluate(pos, e);
+ e->openFiles = popcount(e->semiopenFiles[WHITE] & e->semiopenFiles[BLACK]);
+ e->asymmetry = popcount( (e->passedPawns[WHITE] | e->passedPawns[BLACK])
+ | (e->semiopenFiles[WHITE] ^ e->semiopenFiles[BLACK]));
+
return e;
}
-/// Entry::shelter_storm() calculates shelter and storm penalties for the file
-/// the king is on, as well as the two adjacent files.
+/// Entry::evaluate_shelter() calculates the shelter bonus and the storm
+/// penalty for a king, looking at the king file and the two closest files.
template
-Value Entry::shelter_storm(const Position& pos, Square ksq) {
+Value Entry::evaluate_shelter(const Position& pos, Square ksq) {
- const Color Them = (Us == WHITE ? BLACK : WHITE);
+ enum { Unopposed, BlockedByPawn, Unblocked };
+ constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
+ constexpr Direction Down = (Us == WHITE ? SOUTH : NORTH);
+ constexpr Bitboard BlockRanks = (Us == WHITE ? Rank1BB | Rank2BB : Rank8BB | Rank7BB);
- Value safety = MaxSafetyBonus;
- Bitboard b = pos.pieces(PAWN) & (in_front_bb(Us, ksq) | rank_bb(ksq));
- Bitboard ourPawns = b & pos.pieces(Us) & ~rank_bb(ksq);
+ Bitboard b = pos.pieces(PAWN) & (forward_ranks_bb(Us, ksq) | rank_bb(ksq));
+ Bitboard ourPawns = b & pos.pieces(Us);
Bitboard theirPawns = b & pos.pieces(Them);
- Rank rkUs, rkThem;
- File kf = file_of(ksq);
- kf = (kf == FILE_A) ? FILE_B : (kf == FILE_H) ? FILE_G : kf;
+ Value safety = (ourPawns & file_bb(ksq)) ? Value(5) : Value(-5);
+
+ if ((shift(theirPawns) & (FileABB | FileHBB) & BlockRanks) & ksq)
+ safety += 374;
- for (int f = kf - 1; f <= kf + 1; f++)
+ File center = std::max(FILE_B, std::min(FILE_G, file_of(ksq)));
+ for (File f = File(center - 1); f <= File(center + 1); ++f)
{
- // Shelter penalty is higher for the pawn in front of the king
- b = ourPawns & FileBB[f];
- rkUs = b ? rank_of(Us == WHITE ? lsb(b) : ~msb(b)) : RANK_1;
- safety -= ShelterWeakness[f != kf][rkUs];
-
- // Storm danger is smaller if enemy pawn is blocked
- b = theirPawns & FileBB[f];
- rkThem = b ? rank_of(Us == WHITE ? lsb(b) : ~msb(b)) : RANK_1;
- safety -= StormDanger[rkThem == rkUs + 1][rkThem];
+ b = ourPawns & file_bb(f);
+ Rank rkUs = b ? relative_rank(Us, backmost_sq(Us, b)) : RANK_1;
+
+ b = theirPawns & file_bb(f);
+ Rank rkThem = b ? relative_rank(Us, frontmost_sq(Them, b)) : RANK_1;
+
+ int d = std::min(f, ~f);
+ safety += ShelterStrength[d][rkUs]
+ - StormDanger[rkUs == RANK_1 ? Unopposed :
+ rkUs == rkThem - 1 ? BlockedByPawn : Unblocked]
+ [d][rkThem];
}
return safety;
}
-/// 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.
+/// Entry::do_king_safety() calculates a bonus for king safety. It is called only
+/// when king square changes, which is about 20% of total king_safety() calls.
template
-Score Entry::update_safety(const Position& pos, Square ksq) {
+Score Entry::do_king_safety(const Position& pos, Square ksq) {
kingSquares[Us] = ksq;
- castleRights[Us] = pos.can_castle(Us);
- minKPdistance[Us] = 0;
+ castlingRights[Us] = pos.can_castle(Us);
+ int minKingPawnDistance = 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]);
+ while (!(DistanceRingBB[ksq][minKingPawnDistance++] & pawns)) {}
- Value bonus = shelter_storm(pos, ksq);
+ Value bonus = evaluate_shelter(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 we can castle use the bonus after the castling if it is bigger
+ if (pos.can_castle(MakeCastling::right))
+ bonus = std::max(bonus, evaluate_shelter(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)));
+ if (pos.can_castle(MakeCastling::right))
+ bonus = std::max(bonus, evaluate_shelter(pos, relative_square(Us, SQ_C1)));
- return kingSafety[Us] = make_score(bonus, -16 * minKPdistance[Us]);
+ return make_score(bonus, -16 * minKingPawnDistance);
}
// Explicit template instantiation
-template Score Entry::update_safety(const Position& pos, Square ksq);
-template Score Entry::update_safety(const Position& pos, Square ksq);
+template Score Entry::do_king_safety(const Position& pos, Square ksq);
+template Score Entry::do_king_safety(const Position& pos, Square ksq);
} // namespace Pawns