X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=42ce525882f5d47bf9937328cbb03ba8b59de02e;hp=275d7ae16ae33681013ab6fc76f6fab23c39a1c5;hb=f0a7bed6fb8a95d7f3a8a226fc21159cb9b29810;hpb=5a7cdadfb31db2e8dcaf7be4ecc7953698cd7eef diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 275d7ae1..42ce5258 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -89,7 +89,7 @@ namespace { constexpr Value SpaceThreshold = Value(12222); // KingAttackWeights[PieceType] contains king attack weights by piece type - constexpr int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 78, 56, 45, 11 }; + constexpr int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 77, 55, 44, 10 }; // Penalties for enemy's safe checks constexpr int QueenSafeCheck = 780; @@ -142,32 +142,32 @@ namespace { // ThreatByKing[on one/on many] contains bonuses for king attacks on // pawns or pieces which are not pawn-defended. - constexpr Score ThreatByKing[] = { S(3, 65), S(9, 145) }; + constexpr Score ThreatByKing[] = { S(30, 62), S(-9, 160) }; // PassedRank[Rank] contains a bonus according to the rank of a passed pawn constexpr Score PassedRank[RANK_NB] = { - S(0, 0), S(5, 7), S(5, 13), S(32, 42), S(70, 70), S(172, 170), S(217, 269) + S(0, 0), S(4, 17), S(7, 20), S(14, 36), S(42, 62), S(165, 171), S(279, 252) }; // PassedFile[File] contains a bonus according to the file of a passed pawn constexpr Score PassedFile[FILE_NB] = { - S( 9, 10), S(2, 10), S(1, -8), S(-20,-12), - S(-20,-12), S(1, -8), S(2, 10), S( 9, 10) + S( 11, 14), S( 0, -5), S(-2, -8), S(-25,-13), + S(-25,-13), S(-2, -8), S( 0, -5), S( 11, 14) }; // PassedDanger[Rank] contains a term to weight the passed score constexpr int PassedDanger[RANK_NB] = { 0, 0, 0, 2, 7, 12, 19 }; // KingProtector[PieceType-2] contains a penalty according to distance from king - constexpr Score KingProtector[] = { S(3, 5), S(4, 3), S(3, 0), S(1, -1) }; + constexpr Score KingProtector[] = { S(4, 6), S(6, 3), S(1, 0), S(0, -2) }; // Assorted bonuses and penalties constexpr Score BishopPawns = S( 3, 5); - constexpr Score CloseEnemies = S( 7, 0); + constexpr Score CloseEnemies = S( 8, 0); constexpr Score Connectivity = S( 3, 1); constexpr Score CorneredBishop = S( 50, 50); constexpr Score Hanging = S( 52, 30); - constexpr Score HinderPassedPawn = S( 8, 1); + constexpr Score HinderPassedPawn = S( 5, -1); constexpr Score KnightOnQueen = S( 21, 11); constexpr Score LongDiagonalBishop = S( 22, 0); constexpr Score MinorBehindPawn = S( 16, 0); @@ -175,12 +175,12 @@ namespace { constexpr Score PawnlessFlank = S( 20, 80); constexpr Score RookOnPawn = S( 8, 24); constexpr Score SliderOnQueen = S( 42, 21); - constexpr Score ThreatByPawnPush = S( 47, 26); + constexpr Score ThreatByPawnPush = S( 49, 30); constexpr Score ThreatByRank = S( 16, 3); - constexpr Score ThreatBySafePawn = S(175,168); + constexpr Score ThreatBySafePawn = S(165,133); constexpr Score TrappedRook = S( 92, 0); constexpr Score WeakQueen = S( 50, 10); - constexpr Score WeakUnopposedPawn = S( 5, 25); + constexpr Score WeakUnopposedPawn = S( 5, 26); #undef S @@ -281,7 +281,7 @@ namespace { else if (file_of(pos.square(Us)) == FILE_A) kingRing[Us] |= shift(kingRing[Us]); - kingAttackersCount[Them] = popcount(attackedBy[Us][KING] & pe->pawn_attacks(Them)); + kingAttackersCount[Them] = popcount(kingRing[Us] & pe->pawn_attacks(Them)); kingAttacksCount[Them] = kingAttackersWeight[Them] = 0; } else @@ -420,7 +420,7 @@ namespace { : AllSquares ^ Rank1BB ^ Rank2BB ^ Rank3BB); const Square ksq = pos.square(Us); - Bitboard weak, b, b1, b2, safe, unsafeChecks, pinned; + Bitboard weak, b, b1, b2, safe, unsafeChecks; // King shelter and enemy pawns storm Score score = pe->king_safety(pos, ksq); @@ -472,15 +472,14 @@ namespace { // Unsafe or occupied checking squares will also be considered, as long as // the square is in the attacker's mobility area. unsafeChecks &= mobilityArea[Them]; - pinned = pos.blockers_for_king(Us) & pos.pieces(Us); kingDanger += kingAttackersCount[Them] * kingAttackersWeight[Them] - + 102 * kingAttacksCount[Them] - + 191 * popcount(kingRing[Us] & weak) - + 143 * popcount(pinned | unsafeChecks) - - 848 * !pos.count(Them) - - 9 * mg_value(score) / 8 - + 40; + + 64 * kingAttacksCount[Them] + + 183 * popcount(kingRing[Us] & weak) + + 122 * popcount(pos.blockers_for_king(Us) | unsafeChecks) + - 860 * !pos.count(Them) + - 7 * mg_value(score) / 8 + + 17 ; // Transform the kingDanger units into a Score, and subtract it from the evaluation if (kingDanger > 0) @@ -648,7 +647,7 @@ namespace { assert(!(pos.pieces(Them, PAWN) & forward_file_bb(Us, s + Up))); - bb = forward_file_bb(Us, s) & (attackedBy[Them][ALL_PIECES] | pos.pieces(Them)); + bb = forward_file_bb(Us, s) & pos.pieces(Them); score -= HinderPassedPawn * popcount(bb); int r = relative_rank(Us, s); @@ -772,9 +771,9 @@ namespace { && (pos.pieces(PAWN) & KingSide); // Compute the initiative bonus for the attacking side - int complexity = 8 * outflanking - + 8 * pe->pawn_asymmetry() + int complexity = 8 * pe->pawn_asymmetry() + 12 * pos.count() + + 12 * outflanking + 16 * pawnsOnBothFlanks + 48 * !pos.non_pawn_material() -136 ; @@ -802,20 +801,12 @@ namespace { // If scale is not already specific, scale down the endgame via general heuristics if (sf == SCALE_FACTOR_NORMAL) { - if (pos.opposite_bishops()) - { - // Endgame with opposite-colored bishops and no other pieces is almost a draw - if ( pos.non_pawn_material(WHITE) == BishopValueMg - && pos.non_pawn_material(BLACK) == BishopValueMg) - sf = 31; - - // Endgame with opposite-colored bishops, but also other pieces. Still - // a bit drawish, but not as drawish as with only the two bishops. - else - sf = 46; - } + if ( pos.opposite_bishops() + && pos.non_pawn_material(WHITE) == BishopValueMg + && pos.non_pawn_material(BLACK) == BishopValueMg) + sf = 31; else - sf = std::min(40 + 7 * pos.count(strongSide), sf); + sf = std::min(40 + (pos.opposite_bishops() ? 2 : 7) * pos.count(strongSide), sf); } return ScaleFactor(sf);