X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=b8f82cff4a6718eae4813201191009330e9c30c9;hp=71ec344394506b821c59341f57b1c2d478bac375;hb=6d24ef8585c2ed5618eb9b4ab1d8ee35a05ce2cd;hpb=76d113f5f062a0b977d57642c73948b8f33120ee diff --git a/src/pawns.cpp b/src/pawns.cpp index 71ec3443..b8f82cff 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -2,7 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad - Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad + Copyright (C) 2015-2017 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 @@ -32,10 +32,10 @@ namespace { #define S(mg, eg) make_score(mg, eg) // Isolated pawn penalty by opposed flag - const Score Isolated[2] = { S(45, 40), S(30, 27) }; + const Score Isolated[] = { S(45, 40), S(30, 27) }; // Backward pawn penalty by opposed flag - const Score Backward[2] = { S(56, 33), S(41, 19) }; + const Score Backward[] = { S(56, 33), S(41, 19) }; // Unsupported pawn penalty for pawns which are neither isolated or backward const Score Unsupported = S(17, 8); @@ -44,7 +44,7 @@ namespace { Score Connected[2][2][2][RANK_NB]; // Doubled pawn penalty - const Score Doubled = S(18,38); + const Score Doubled = S(18, 38); // Lever bonus by rank const Score Lever[RANK_NB] = { @@ -52,7 +52,8 @@ namespace { S(17, 16), S(33, 32), S(0, 0), S(0, 0) }; - // Weakness of our pawn shelter in front of the king by [distance from edge][rank] + // Weakness of our pawn shelter in front of the king by [distance from edge][rank]. + // RANK_1 = 0 is used for files where we have no pawns or our pawn is behind our king. const Value ShelterWeakness[][RANK_NB] = { { V(100), V(20), V(10), V(46), V(82), V( 86), V( 98) }, { V(116), V( 4), V(28), V(87), V(94), V(108), V(104) }, @@ -60,25 +61,26 @@ namespace { { V( 75), V(12), V(43), V(59), V(90), V( 84), V(112) } }; - // Danger of enemy pawns moving toward our king by [type][distance from edge][rank] + // 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. const Value StormDanger[][4][RANK_NB] = { - { { V( 4), V( 73), V( 132), V(46), V(31) }, + { { V( 0), V(-290), V(-274), V(57), V(41) }, //BlockedByKing + { V( 0), V( 60), V( 144), V(39), V(13) }, + { V( 0), V( 65), V( 141), V(41), V(34) }, + { V( 0), V( 53), V( 127), V(56), V(14) } }, + { { 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(22), V( 45), V( 104), V(62), V( 6) }, - { 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) } }, - { { V( 0), V( 0), V( 79), V(23), V( 1) }, + { { V( 0), V( 0), V( 79), V(23), V( 1) }, //BlockedByPawn { V( 0), V( 0), V( 148), V(27), V( 2) }, { V( 0), V( 0), V( 161), V(16), V( 1) }, { V( 0), V( 0), V( 171), V(22), V(15) } }, - { { V( 0), V(-290), V(-274), V(57), V(41) }, - { V( 0), V( 60), V( 144), V(39), V(13) }, - { V( 0), V( 65), V( 141), V(41), V(34) }, - { V( 0), V( 53), V( 127), V(56), V(14) } } - + { { 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) } } }; // Max bonus for king safety. Corresponds to start position with all the pawns @@ -97,13 +99,13 @@ namespace { const Square Left = (Us == WHITE ? NORTH_WEST : SOUTH_EAST); Bitboard b, neighbours, stoppers, doubled, supported, phalanx; + Bitboard lever, leverPush, connected; Square s; - bool opposed, lever, connected, backward; + bool opposed, backward; Score score = SCORE_ZERO; const Square* pl = pos.squares(Us); - const Bitboard* pawnAttacksBB = StepAttacksBB[make_piece(Us, PAWN)]; - Bitboard ourPawns = pos.pieces(Us , PAWN); + Bitboard ourPawns = pos.pieces( Us, PAWN); Bitboard theirPawns = pos.pieces(Them, PAWN); e->passedPawns[Us] = e->pawnAttacksSpan[Us] = 0; @@ -124,10 +126,11 @@ namespace { e->pawnAttacksSpan[Us] |= pawn_attack_span(Us, s); // Flag the pawn - opposed = theirPawns & forward_bb(Us, s); + opposed = theirPawns & forward_file_bb(Us, s); stoppers = theirPawns & passed_pawn_mask(Us, s); - lever = theirPawns & pawnAttacksBB[s]; - doubled = ourPawns & (s + Up); + 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); @@ -151,10 +154,24 @@ namespace { } // Passed pawns will be properly scored in evaluation because we need - // full attack info to evaluate them. - if (!stoppers && !(ourPawns & forward_bb(Us, s))) + // 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) + && popcount(phalanx) >= popcount(leverPush)) e->passedPawns[Us] |= s; + else if ( stoppers == SquareBB[s + Up] + && relative_rank(Us, s) >= RANK_5) + { + b = shift(supported) & ~theirPawns; + while (b) + if (!more_than_one(theirPawns & PawnAttacks[Us][pop_lsb(&b)])) + e->passedPawns[Us] |= s; + } + // Score this pawn if (!neighbours) score -= Isolated[opposed]; @@ -168,7 +185,7 @@ namespace { if (connected) score += Connected[opposed][!!phalanx][more_than_one(supported)][relative_rank(Us, s)]; - if (doubled) + if (doubled && !supported) score -= Doubled; if (lever) @@ -197,7 +214,7 @@ void init() { { int v = (Seed[r] + (phalanx ? (Seed[r + 1] - Seed[r]) / 2 : 0)) >> opposed; v += (apex ? v / 2 : 0); - Connected[opposed][phalanx][apex][r] = make_score(v, v * 5 / 8); + Connected[opposed][phalanx][apex][r] = make_score(v, v * (r-2) / 4); } } @@ -224,16 +241,16 @@ Entry* probe(const Position& pos) { /// Entry::shelter_storm() calculates shelter and storm penalties for the file -/// the king is on, as well as the two adjacent files. +/// the king is on, as well as the two closest files. template Value Entry::shelter_storm(const Position& pos, Square ksq) { const Color Them = (Us == WHITE ? BLACK : WHITE); - enum { NoFriendlyPawn, Unblocked, BlockedByPawn, BlockedByKing }; + enum { BlockedByKing, Unopposed, BlockedByPawn, Unblocked }; - Bitboard b = pos.pieces(PAWN) & (in_front_bb(Us, rank_of(ksq)) | 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); Value safety = MaxSafetyBonus; @@ -244,15 +261,16 @@ Value Entry::shelter_storm(const Position& pos, Square ksq) { b = ourPawns & file_bb(f); Rank rkUs = b ? relative_rank(Us, backmost_sq(Us, b)) : RANK_1; - b = theirPawns & file_bb(f); + b = theirPawns & file_bb(f); Rank rkThem = b ? relative_rank(Us, frontmost_sq(Them, b)) : RANK_1; - safety -= ShelterWeakness[std::min(f, FILE_H - f)][rkUs] + int d = std::min(f, FILE_H - f); + safety -= ShelterWeakness[d][rkUs] + StormDanger [f == file_of(ksq) && rkThem == relative_rank(Us, ksq) + 1 ? BlockedByKing : - rkUs == RANK_1 ? NoFriendlyPawn : + rkUs == RANK_1 ? Unopposed : rkThem == rkUs + 1 ? BlockedByPawn : Unblocked] - [std::min(f, FILE_H - f)][rkThem]; + [d][rkThem]; } return safety;