X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=08b0e7ba0fc32288dfcedb551bef82a89b197df1;hp=6fd3e215b6fbee634489d76690fd101e5de5a89f;hb=3376c68f4bb83dc9fd874eb9d710dab09609ae54;hpb=c97104e8540b72ee2c6c9c13d3773d2c0f9ec32f diff --git a/src/pawns.cpp b/src/pawns.cpp index 6fd3e215..08b0e7ba 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 Marco Costalba + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,9 @@ #include #include +#include "bitcount.h" #include "pawns.h" +#include "position.h" //// @@ -119,14 +121,12 @@ namespace { 0, 0, 0, 0, 0, 0, 0, 0 }; - // Pawn storm open file bonuses by file: - const int KStormOpenFileBonus[8] = { - 45, 45, 30, 0, 0, 0, 0, 0 - }; + // Pawn storm open file bonuses by file + const int16_t KStormOpenFileBonus[8] = { 45, 45, 30, 0, 0, 0, 0, 0 }; + const int16_t QStormOpenFileBonus[8] = { 0, 0, 0, 0, 0, 30, 45, 30 }; - const int QStormOpenFileBonus[8] = { - 0, 0, 0, 0, 0, 30, 45, 30 - }; + // Pawn storm lever bonuses by file + const int StormLeverBonus[8] = { 20, 20, 10, 0, 0, 10, 20, 20 }; } @@ -145,7 +145,7 @@ PawnInfoTable::PawnInfoTable(unsigned numOfEntries) { { std::cerr << "Failed to allocate " << (numOfEntries * sizeof(PawnInfo)) << " bytes for pawn hash table." << std::endl; - exit(EXIT_FAILURE); + Application::exit_with_failure(); } clear(); } @@ -199,6 +199,7 @@ PawnInfo *PawnInfoTable::get_pawn_info(const Position &pos) { Bitboard ourPawns = pos.pawns(us); Bitboard theirPawns = pos.pawns(them); Bitboard pawns = ourPawns; + int bonus; // Initialize pawn storm scores by giving bonuses for open files for (File f = FILE_A; f <= FILE_H; f++) @@ -216,7 +217,7 @@ PawnInfo *PawnInfoTable::get_pawn_info(const Position &pos) { File f = square_file(s); Rank r = square_rank(s); - assert(pos.piece_on(s) == pawn_of_color(us)); + assert(pos.piece_on(s) == piece_of_color_and_type(us, PAWN)); // The file containing the pawn is not half open pi->halfOpenFiles[us] &= ~(1 << f); @@ -226,54 +227,66 @@ PawnInfo *PawnInfoTable::get_pawn_info(const Position &pos) { isolated = pos.pawn_is_isolated(us, s); doubled = pos.pawn_is_doubled(us, s); - // We calculate kingside and queenside pawn storm scores - // for both colors. These are used when evaluating middle - // game positions with opposite side castling. + // 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[]). This score is increased if - // there are enemy pawns on adjacent files in front of the pawn. - // This is because we want to be able to open files against the - // enemy king, and to avoid blocking the pawn structure (e.g. white - // pawns on h6, g5, black pawns on h7, g6, f7). - - // Kingside and queenside pawn storms - int KBonus = KStormTable[relative_square(us, s)]; - int QBonus = QStormTable[relative_square(us, s)]; - bool outPostFlag = (KBonus > 0 && (outpost_mask(us, s) & theirPawns)); - bool passedFlag = (QBonus > 0 && (passed_pawn_mask(us, s) & theirPawns)); - - switch (f) { - - case FILE_A: - QBonus += passedFlag * QBonus / 2; - break; - - case FILE_B: - QBonus += passedFlag * (QBonus / 2 + QBonus / 4); - break; - - case FILE_C: - QBonus += passedFlag * QBonus / 2; - break; - - case FILE_F: - KBonus += outPostFlag * KBonus / 4; - break; - - case FILE_G: - KBonus += outPostFlag * (KBonus / 2 + KBonus / 4); - break; - - case FILE_H: - KBonus += outPostFlag * KBonus / 2; - break; - - default: - break; + // (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) + { + Square s2 = pop_1st_bit(&b); + if (!(theirPawns & neighboring_files_bb(s2) & rank_bb(s2))) + { + // The enemy pawn has no pawn beside itself, which makes it + // particularly vulnerable. Big bonus, especially against a + // weakness on the rook file. + if (square_file(s2) == FILE_H) + bonus += 4*StormLeverBonus[f] - 8*square_distance(s, s2); + else + bonus += 2*StormLeverBonus[f] - 4*square_distance(s, s2); + } else + // There is at least one enemy pawn beside the enemy pawn we look + // at, which means that the pawn has somewhat better chances of + // defending itself by advancing. Smaller bonus. + bonus += StormLeverBonus[f] - 2*square_distance(s, s2); + } + } + pi->ksStormValue[us] += bonus; + + // 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) + { + Square s2 = pop_1st_bit(&b); + if (!(theirPawns & neighboring_files_bb(s2) & rank_bb(s2))) + { + // The enemy pawn has no pawn beside itself, which makes it + // particularly vulnerable. Big bonus, especially against a + // weakness on the rook file. + if (square_file(s2) == FILE_A) + bonus += 4*StormLeverBonus[f] - 16*square_distance(s, s2); + else + bonus += 2*StormLeverBonus[f] - 8*square_distance(s, s2); + } else + // There is at least one enemy pawn beside the enemy pawn we look + // at, which means that the pawn has somewhat better chances of + // defending itself by advancing. Smaller bonus. + bonus += StormLeverBonus[f] - 4*square_distance(s, s2); + } } - pi->ksStormValue[us] += KBonus; - pi->qsStormValue[us] += QBonus; + pi->qsStormValue[us] += bonus; // 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 @@ -317,8 +330,8 @@ PawnInfo *PawnInfoTable::get_pawn_info(const Position &pos) { // Test for candidate passed pawn candidate = !passed && pos.file_is_half_open(them, f) - && ( 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) + && ( 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); // In order to prevent doubled passed pawns from receiving a too big