X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=069c8d9401aa29127699235ee9e6cb872384d367;hp=b381b5c4abc3f567cec33c1b7a68964c70e65adf;hb=55bd27b8f08a151128d7065fa2819aa3e9605299;hpb=6b7efa0cd14b73416c9030462f79a02bbfc7ad2c diff --git a/src/pawns.cpp b/src/pawns.cpp index b381b5c4..069c8d94 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-2012 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,46 +17,38 @@ along with this program. If not, see . */ - -//// -//// Includes -//// - #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 DoubledPawnPenalty[2][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) }, + { 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 IsolatedPawnPenalty[2][8] = { + { 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 BackwardPawnPenalty[2][8] = { + { 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] = { @@ -70,278 +62,152 @@ namespace { S(34,68), S(83,166), S(0, 0), S( 0, 0) }; - // UnpairedPawnsTable[] gives a score according to the number - // of panws that do not have an enemy pawn in front of them. - const int UnpairedPawnsTable[8] = { - SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL, - SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL - }; - - // Pawn storm tables for positions with opposite castling - const int QStormTable[64] = { - 0, 0, 0, 0, 0, 0, 0, 0, - -22,-22,-22,-14,-6, 0, 0, 0, - -6,-10,-10,-10,-6, 0, 0, 0, - 4, 12, 16, 12, 4, 0, 0, 0, - 16, 23, 23, 16, 0, 0, 0, 0, - 23, 31, 31, 23, 0, 0, 0, 0, - 23, 31, 31, 23, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 - }; + const Score PawnStructureWeight = S(233, 201); - const int KStormTable[64] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,-10,-19,-28,-33,-33, - 0, 0, 0,-10,-15,-19,-24,-24, - 0, 0, 0, 0, 1, 1, 1, 1, - 0, 0, 0, 0, 1, 10, 19, 19, - 0, 0, 0, 0, 1, 19, 31, 27, - 0, 0, 0, 0, 0, 22, 31, 22, - 0, 0, 0, 0, 0, 0, 0, 0 - }; + // Weakness of our pawn shelter in front of the king indexed by [king pawn][rank] + const Value ShelterWeakness[2][8] = + { { 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) } }; - // Pawn storm open file bonuses by file - const int16_t KStormOpenFileBonus[8] = { 31, 31, 18, 0, 0, 0, 0, 0 }; - const int16_t QStormOpenFileBonus[8] = { 0, 0, 0, 0, 0, 26, 42, 26 }; + // Danger of enemy pawns moving toward our king indexed by [pawn blocked][rank] + const Value StormDanger[2][8] = + { { V(26), V(0), V(128), V(51), V(26) }, + { V(13), V(0), V( 64), V(25), V(13) } }; - // Pawn storm lever bonuses by file - const int StormLeverBonus[8] = { -8, -8, -13, 0, 0, -13, -8, -8 }; + // 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); + #undef S + #undef V } -//// -//// Functions -//// - -/// Constructor +/// PawnTable::probe() takes a position object as input, computes a PawnEntry +/// 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. -PawnInfoTable::PawnInfoTable(unsigned numOfEntries) { - - size = numOfEntries; - entries = new PawnInfo[size]; - if (!entries) - { - std::cerr << "Failed to allocate " << (numOfEntries * sizeof(PawnInfo)) - << " bytes for pawn hash table." << std::endl; - Application::exit_with_failure(); - } -} +PawnEntry* PawnTable::probe(const Position& pos) { + Key key = pos.pawn_key(); + PawnEntry* e = entries[key]; -/// Destructor + // If e->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 (e->key == key) + return e; -PawnInfoTable::~PawnInfoTable() { - delete [] entries; -} + e->key = key; + e->passedPawns[WHITE] = e->passedPawns[BLACK] = 0; + e->kingSquares[WHITE] = e->kingSquares[BLACK] = SQ_NONE; + e->halfOpenFiles[WHITE] = e->halfOpenFiles[BLACK] = 0xFF; + Bitboard wPawns = pos.pieces(WHITE, PAWN); + Bitboard bPawns = pos.pieces(BLACK, PAWN); + e->pawnAttacks[WHITE] = ((wPawns & ~FileHBB) << 9) | ((wPawns & ~FileABB) << 7); + e->pawnAttacks[BLACK] = ((bPawns & ~FileHBB) >> 7) | ((bPawns & ~FileABB) >> 9); -/// PawnInfo::clear() resets to zero the PawnInfo entry. Note that -/// kingSquares[] is initialized to SQ_NONE instead. + e->value = evaluate_pawns(pos, wPawns, bPawns, e) + - evaluate_pawns(pos, bPawns, wPawns, e); -void PawnInfo::clear() { + e->value = apply_weight(e->value, PawnStructureWeight); - memset(this, 0, sizeof(PawnInfo)); - kingSquares[WHITE] = kingSquares[BLACK] = SQ_NONE; + 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. - -PawnInfo* PawnInfoTable::get_pawn_info(const Position& pos) { - - assert(pos.is_ok()); - - Key key = pos.get_pawn_key(); - int index = int(key & (size - 1)); - PawnInfo* pi = entries + index; - - // 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; - - // Clear the PawnInfo object, and set the key - pi->clear(); - pi->key = key; - - // 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); - - // Evaluate pawns for both colors - pi->value = evaluate_pawns(pos, whitePawns, blackPawns, pi) - - evaluate_pawns(pos, blackPawns, whitePawns, pi); - return pi; -} +/// PawnTable::evaluate_pawns() evaluates each pawn of the given color +template +Score PawnTable::evaluate_pawns(const Position& pos, Bitboard ourPawns, + Bitboard theirPawns, PawnEntry* e) { -/// PawnInfoTable::evaluate_pawns() evaluates each pawn of the given color + const Color Them = (Us == WHITE ? BLACK : WHITE); -template -Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns, - Bitboard theirPawns, PawnInfo* pi) { + Bitboard b; Square s; File f; Rank r; bool passed, isolated, doubled, opposed, chain, backward, candidate; - int bonus; - Score value = make_score(0, 0); - const Square* ptr = pos.piece_list_begin(Us, PAWN); - int unpairedPawnsNum = pos.piece_count(Us, PAWN); - - // Initialize pawn storm scores by giving bonuses for open files - for (f = FILE_A; f <= FILE_H; f++) - if (!(ourPawns & file_bb(f))) - { - pi->ksStormValue[Us] += KStormOpenFileBonus[f]; - pi->qsStormValue[Us] += QStormOpenFileBonus[f]; - pi->halfOpenFiles[Us] |= (1 << f); - } + Score value = SCORE_ZERO; + const Square* pl = pos.piece_list(Us, PAWN); // Loop through all pawns of the current color and score each pawn - while ((s = *ptr++) != SQ_NONE) + while ((s = *pl++) != SQ_NONE) { - f = square_file(s); - r = square_rank(s); + assert(pos.piece_on(s) == make_piece(Us, PAWN)); - assert(pos.piece_on(s) == piece_of_color_and_type(Us, PAWN)); + f = file_of(s); + r = rank_of(s); - // Passed, isolated or doubled pawn? - passed = !(theirPawns & passed_pawn_mask(Us, s)); - isolated = !(ourPawns & neighboring_files_bb(s)); - doubled = ourPawns & squares_behind(Us, s); - opposed = theirPawns & squares_in_front_of(Us, s); - - // Decrease number of unpaired pawns - if (opposed) - unpairedPawnsNum--; - - // We calculate kingside and queenside pawn storm - // scores for both colors. These are used when evaluating - // middle game positions with opposite side castling. - // - // Each pawn is given a base score given by a piece square table - // (KStormTable[] or QStormTable[]). Pawns which seem to have good - // chances of creating an open file by exchanging itself against an - // enemy pawn on an adjacent file gets an additional bonus. - - // Kingside pawn storms - bonus = KStormTable[relative_square(Us, s)]; - if (f >= FILE_F) - { - Bitboard b = outpost_mask(Us, s) & theirPawns & (FileFBB | FileGBB | FileHBB); - while (b) - { - // Give a bonus according to the distance of the nearest enemy pawn - Square s2 = pop_1st_bit(&b); - int v = StormLeverBonus[f] - 2 * square_distance(s, s2); - - // If enemy pawn has no pawn beside itself is particularly vulnerable. - // Big bonus, especially against a weakness on the rook file - if (!(theirPawns & neighboring_files_bb(s2) & rank_bb(s2))) - v *= (square_file(s2) == FILE_H ? 4 : 2); - - bonus += v; - } - } - pi->ksStormValue[Us] += bonus; + // This file cannot be half open + e->halfOpenFiles[Us] &= ~(1 << f); - // Queenside pawn storms - bonus = QStormTable[relative_square(Us, s)]; - if (f <= FILE_C) - { - Bitboard b = outpost_mask(Us, s) & theirPawns & (FileABB | FileBBB | FileCBB); - while (b) - { - // Give a bonus according to the distance of the nearest enemy pawn - Square s2 = pop_1st_bit(&b); - int v = StormLeverBonus[f] - 4 * square_distance(s, s2); - - // If enemy pawn has no pawn beside itself is particularly vulnerable. - // Big bonus, especially against a weakness on the rook file - if (!(theirPawns & neighboring_files_bb(s2) & rank_bb(s2))) - v *= (square_file(s2) == FILE_A ? 4 : 2); - - bonus += v; - } - } - pi->qsStormValue[Us] += bonus; + // Our rank plus previous one. Used for chain detection + b = rank_bb(r) | rank_bb(Us == WHITE ? r - Rank(1) : r + Rank(1)); - // Member of a pawn chain (but not the backward one)? We could speed up - // the test a little by introducing an array of masks indexed by color - // and square for doing the test, but because everything is hashed, - // it probably won't make any noticable difference. - chain = ourPawns - & neighboring_files_bb(f) - & (rank_bb(r) | rank_bb(r - (Us == WHITE ? 1 : -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 - // - // 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 & behind_bb(Us, r) & neighboring_files_bb(f)) - || (pos.attacks_from(s, Us) & theirPawns)) - backward = false; - else + 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 & attack_span_mask(Them, 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 + // 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. - Bitboard b = pos.attacks_from(s, Us); + 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. + // 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; } - // Test for candidate passed pawn - candidate = !passed - && !opposed - && ( count_1s_max_15(neighboring_files_bb(f) & (behind_bb(Us, r) | rank_bb(r)) & ourPawns) - - count_1s_max_15(neighboring_files_bb(f) & in_front_bb(Us, r) & theirPawns) - >= 0); + assert(opposed | passed | (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; + // 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); - // Score this pawn - if (passed) - set_bit(&(pi->passedPawns), s); + // 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 -= IsolatedPawnPenalty[f]; - if (!(theirPawns & file_bb(f))) - value -= IsolatedPawnPenalty[f] / 2; - } + value -= IsolatedPawnPenalty[opposed][f]; + if (doubled) - value -= DoubledPawnPenalty[f]; + value -= DoubledPawnPenalty[opposed][f]; if (backward) - { - value -= BackwardPawnPenalty[f]; - if (!(theirPawns & file_bb(f))) - value -= BackwardPawnPenalty[f] / 2; - } + value -= BackwardPawnPenalty[opposed][f]; + if (chain) value += ChainBonus[f]; @@ -349,26 +215,73 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns, value += CandidateBonus[relative_rank(Us, s)]; } - // Calculate a scale factor to be used to evaluate if position is drawish - pi->factor[Us] = UnpairedPawnsTable[unpairedPawnsNum]; - return value; } -/// PawnInfo::updateShelter calculates and caches king shelter. It is called -/// only when king square changes, about 20% of total get_king_shelter() calls. -int PawnInfo::updateShelter(const Position& pos, Color c, Square ksq) { +/// PawnEntry::shelter_storm() calculates shelter and storm penalties for the file +/// the king is on, as well as the two adjacent files. + +template +Value PawnEntry::shelter_storm(const Position& pos, Square ksq) { + + const Color Them = (Us == WHITE ? BLACK : WHITE); - unsigned shelter = 0; - Bitboard pawns = pos.pieces(PAWN, c) & this_and_neighboring_files_bb(ksq); - unsigned r = ksq & (7 << 3); - for (int i = 1, k = (c ? -8 : 8); i < 4; i++) + 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 theirPawns = b & pos.pieces(Them); + Rank rkUs, rkThem; + File kf = file_of(ksq); + + kf = (kf == FILE_A) ? kf++ : (kf == FILE_H) ? kf-- : kf; + + for (int f = kf - 1; f <= kf + 1; f++) { - r += k; - shelter += BitCount8Bit[(pawns >> r) & 0xFF] * (128 >> i); + // 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]; } - kingSquares[c] = ksq; - kingShelters[c] = shelter; - return shelter; + + return safety; +} + + +/// PawnEntry::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 PawnEntry::update_safety(const Position& pos, Square ksq) { + + 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 PawnEntry::update_safety(const Position& pos, Square ksq); +template Score PawnEntry::update_safety(const Position& pos, Square ksq);