X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=79fe1ae37ad5105427b88b85d9c7bff8ac63f5a9;hp=e2d8ac3335e6a219fbea0ef84a80afbf21a01f72;hb=19540c9ee824abc156d5a12ab353c250a083da4b;hpb=7b4b65d7a95b3c8b40a11fe5b3efe959d5129008 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index e2d8ac33..79fe1ae3 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -155,8 +155,8 @@ namespace { const Score QueenOn7thBonus = make_score(27, 54); // Rooks on open files (modified by Joona Kiiski) - const Score RookOpenFileBonus = make_score(43, 43); - const Score RookHalfOpenFileBonus = make_score(19, 19); + const Score RookOpenFileBonus = make_score(43, 21); + const Score RookHalfOpenFileBonus = make_score(19, 10); // Penalty for rooks trapped inside a friendly king which has lost the // right to castle. @@ -493,10 +493,8 @@ namespace { else assert(false); - // Update attack info ei.attackedBy[Us][Piece] |= b; - // King attacks if (b & ei.kingRing[Them]) { ei.kingAttackersCount[Us]++; @@ -506,12 +504,23 @@ namespace { ei.kingAdjacentZoneAttacksCount[Us] += popcount(bb); } - // Mobility mob = (Piece != QUEEN ? popcount(b & mobilityArea) : popcount(b & mobilityArea)); mobility += MobilityBonus[Piece][mob]; + // Add a bonus if a slider is pinning an enemy piece + if ( (Piece == BISHOP || Piece == ROOK || Piece == QUEEN) + && (PseudoAttacks[Piece][pos.king_square(Them)] & s)) + { + b = BetweenBB[s][pos.king_square(Them)] & pos.occupied_squares(); + + assert(b); + + if (single_bit(b) && (b & pos.pieces(Them))) + score += ThreatBonus[Piece][type_of(pos.piece_on(first_1(b)))] / 2; + } + // Decrease score if we are attacked by an enemy pawn. Remaining part // of threat evaluation must be done later when we have full attack info. if (ei.attackedBy[Them][PAWN] & s)