X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=35764b717207e38b3871f367d4edbe5c400f8fc6;hp=b1a85a0fcb67cb1692db334b09d437fca3ee356f;hb=d909d10f33df023be46a2633608bdf655d1f5a62;hpb=1d09ee70f7da1f9aa60c7ff97a35881327f69a03 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index b1a85a0f..35764b71 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -119,7 +119,7 @@ namespace { // game, indexed by piece type and number of attacked squares in the MobilityArea. const Score MobilityBonus[][32] = { {}, {}, - { S(-75,-76), S(-56,-54), S(- 9,-26), S( -2,-10), S( 6, 5), S( 15, 11), // Knights + { S(-75,-76), S(-56,-54), S( -9,-26), S( -2,-10), S( 6, 5), S( 15, 11), // Knights S( 22, 26), S( 30, 28), S( 36, 29) }, { S(-48,-58), S(-21,-19), S( 16, -2), S( 26, 12), S( 37, 22), S( 51, 42), // Bishops S( 54, 54), S( 63, 58), S( 65, 63), S( 71, 70), S( 79, 74), S( 81, 86), @@ -188,6 +188,7 @@ namespace { const Score BishopPawns = S( 8, 12); const Score RookOnPawn = S( 8, 24); const Score TrappedRook = S(92, 0); + const Score CloseEnemies = S( 7, 0); const Score SafeCheck = S(20, 20); const Score OtherCheck = S(10, 10); const Score ThreatByHangingPawn = S(71, 61); @@ -209,7 +210,7 @@ namespace { // in KingDanger[]. Various little "meta-bonuses" measuring the strength // of the enemy attack are added up into an integer, which is used as an // index to KingDanger[]. - Score KingDanger[512]; + Score KingDanger[400]; // KingAttackWeights[PieceType] contains king attack weights by piece type const int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 7, 5, 4, 1 }; @@ -359,7 +360,7 @@ namespace { if (Pt == QUEEN) { // Penalty if any relative pin or discovered attack against the queen - if (pos.slider_blockers(pos.pieces(), pos.pieces(Them, ROOK, BISHOP), s)) + if (pos.slider_blockers(pos.pieces(Them, ROOK, BISHOP), s)) score -= WeakQueen; } } @@ -379,6 +380,19 @@ namespace { // evaluate_king() assigns bonuses and penalties to a king of a given color + const Bitboard WhiteCamp = Rank1BB | Rank2BB | Rank3BB | Rank4BB | Rank5BB; + const Bitboard BlackCamp = Rank8BB | Rank7BB | Rank6BB | Rank5BB | Rank4BB; + const Bitboard QueenSide = FileABB | FileBBB | FileCBB | FileDBB; + const Bitboard CenterFiles = FileCBB | FileDBB | FileEBB | FileFBB; + const Bitboard KingSide = FileEBB | FileFBB | FileGBB | FileHBB; + + const Bitboard KingFlank[COLOR_NB][FILE_NB] = { + { QueenSide & WhiteCamp, QueenSide & WhiteCamp, QueenSide & WhiteCamp, CenterFiles & WhiteCamp, + CenterFiles & WhiteCamp, KingSide & WhiteCamp, KingSide & WhiteCamp, KingSide & WhiteCamp }, + { QueenSide & BlackCamp, QueenSide & BlackCamp, QueenSide & BlackCamp, CenterFiles & BlackCamp, + CenterFiles & BlackCamp, KingSide & BlackCamp, KingSide & BlackCamp, KingSide & BlackCamp }, + }; + template Score evaluate_king(const Position& pos, const EvalInfo& ei) { @@ -471,6 +485,19 @@ namespace { score -= KingDanger[std::max(std::min(attackUnits, 399), 0)]; } + // King tropism: firstly, find squares that opponent attacks in our king flank + b = ei.attackedBy[Them][ALL_PIECES] & KingFlank[Us][file_of(ksq)]; + + assert(((Us == WHITE ? b << 4 : b >> 4) & b) == 0); + assert(popcount(Us == WHITE ? b << 4 : b >> 4) == popcount(b)); + + // Secondly, add the squares which are attacked twice in that flank and + // which are not defended by our pawns. + b = (Us == WHITE ? b << 4 : b >> 4) + | (b & ei.attackedBy2[Them] & ~ei.attackedBy[Us][PAWN]); + + score -= CloseEnemies * popcount(b); + if (DoTrace) Trace::add(KING, Us, score); @@ -491,18 +518,6 @@ namespace { const Bitboard TRank2BB = (Us == WHITE ? Rank2BB : Rank7BB); const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); - const Bitboard TheirCamp = (Us == WHITE ? Rank4BB | Rank5BB | Rank6BB | Rank7BB | Rank8BB - : Rank5BB | Rank4BB | Rank3BB | Rank2BB | Rank1BB); - - const Bitboard QueenSide = TheirCamp & (FileABB | FileBBB | FileCBB | FileDBB); - const Bitboard CenterFiles = TheirCamp & (FileCBB | FileDBB | FileEBB | FileFBB); - const Bitboard KingSide = TheirCamp & (FileEBB | FileFBB | FileGBB | FileHBB); - - const Bitboard KingFlank[FILE_NB] = { - QueenSide, QueenSide, QueenSide, CenterFiles, - CenterFiles, KingSide, KingSide, KingSide - }; - enum { Minor, Rook }; Bitboard b, weak, defended, safeThreats; @@ -570,18 +585,6 @@ namespace { score += ThreatByPawnPush * popcount(b); - // King tropism: firstly, find squares that we attack in the enemy king flank - b = ei.attackedBy[Us][ALL_PIECES] & KingFlank[file_of(pos.square(Them))]; - - // Secondly, add to the bitboard the squares which we attack twice in that flank - // but which are not protected by a enemy pawn. Note the trick to shift away the - // previous attack bits to the empty part of the bitboard. - b = (b & ei.attackedBy2[Us] & ~ei.attackedBy[Them][PAWN]) - | (Us == WHITE ? b >> 4 : b << 4); - - // Count all these squares with a single popcount - score += make_score(7 * popcount(b), 0); - if (DoTrace) Trace::add(THREAT, Us, score); @@ -702,10 +705,10 @@ namespace { // ...count safe + (behind & safe) with a single popcount int bonus = popcount((Us == WHITE ? safe << 32 : safe >> 32) | (behind & safe)); - int weight = pos.count(Us) + pos.count(Us) - + pos.count(Them) + pos.count(Them); + bonus = std::min(16, bonus); + int weight = pos.count(Us) - 2 * ei.pi->open_files(); - return make_score(bonus * weight * weight * 2 / 11, 0); + return make_score(bonus * weight * weight / 18, 0); } @@ -757,9 +760,9 @@ namespace { // Endings where weaker side can place his king in front of the opponent's // pawns are drawish. else if ( abs(eg) <= BishopValueEg - && ei.pi->pawn_span(strongSide) <= 1 + && pos.count(strongSide) <= 2 && !pos.pawn_passed(~strongSide, pos.square(~strongSide))) - sf = ei.pi->pawn_span(strongSide) ? ScaleFactor(51) : ScaleFactor(37); + sf = ScaleFactor(37 + 7 * pos.count(strongSide)); } return sf;