X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=e96e635c876f44901a456b41189c98eddbcb85e9;hp=fd78d5af368d2aa3f1b03a1a08882a45c7f8e83b;hb=5c75455c8ea998bb3e60bafbc3fab850bb877187;hpb=422c9c2acd5afb793ab8e26ef9641f7c348cd549 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index fd78d5af..e96e635c 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -91,7 +91,7 @@ namespace { // Evaluation weights, initialized from UCI options enum { Mobility, PawnStructure, PassedPawns, Space, KingDangerUs, KingDangerThem }; - Score Weights[6]; + struct Weight { int mg, eg; } Weights[6]; typedef Value V; #define S(mg, eg) make_score(mg, eg) @@ -119,8 +119,8 @@ namespace { { S(-17,-33), S(-11,-16), S(-5, 0), S( 1, 16), S( 7, 32), S(13, 48), // Rooks S( 18, 64), S( 22, 80), S(26, 96), S(29,109), S(31,115), S(33,119), S( 35,122), S( 36,123), S(37,124) }, - { S(-12,-20), S( -8,-13), S(-5, -7), S(-2, -1), S( 1, 5), S( 4, 11), // Queens - S( 7, 17), S( 10, 23), S(13, 29), S(16, 34), S(18, 38), S(20, 40), + { S(-12,-20), S( -8,-13), S(-5, -7), S( 0, 0), S( 6, 10), S(11, 19), // Queens + S( 13, 29), S( 18, 38), S(20, 40), S(21, 41), S(22, 41), S(22, 41), S( 22, 41), S( 23, 41), S(24, 41), S(25, 41), S(25, 41), S(25, 41), S( 25, 41), S( 25, 41), S(25, 41), S(25, 41), S(25, 41), S(25, 41), S( 25, 41), S( 25, 41), S(25, 41), S(25, 41) } @@ -162,9 +162,7 @@ namespace { const Score Tempo = make_score(24, 11); const Score RookOn7th = make_score(11, 20); - const Score QueenOn7th = make_score( 3, 8); const Score RookOnPawn = make_score(10, 28); - const Score QueenOnPawn = make_score( 4, 20); const Score RookOpenFile = make_score(43, 21); const Score RookSemiopenFile = make_score(19, 10); const Score BishopPawns = make_score( 8, 12); @@ -204,8 +202,6 @@ namespace { const int BishopCheck = 2; const int KnightCheck = 3; - const int UnsupportedPinnedPiece = 2; - // KingDanger[Color][attackUnits] contains the actual king danger weighted // scores, indexed by color and by a calculated integer number. Score KingDanger[COLOR_NB][128]; @@ -217,7 +213,7 @@ namespace { template void init_eval_info(const Position& pos, EvalInfo& ei); - template + template Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility); template @@ -235,8 +231,8 @@ namespace { Score evaluate_unstoppable_pawns(const Position& pos, Color us, const EvalInfo& ei); Value interpolate(const Score& v, Phase ph, ScaleFactor sf); - Score apply_weight(Score v, Score w); - Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight); + Score apply_weight(Score v, const Weight& w); + Weight weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight); } @@ -321,8 +317,7 @@ Value do_evaluate(const Position& pos) { init_eval_info(pos, ei); // Evaluate pieces and mobility - score += evaluate_pieces(pos, ei, mobility) - - evaluate_pieces(pos, ei, mobility); + score += evaluate_pieces(pos, ei, mobility); score += apply_weight(mobility[WHITE] - mobility[BLACK], Weights[Mobility]); @@ -486,6 +481,11 @@ Value do_evaluate(const Position& pos) { ei.kingAdjacentZoneAttacksCount[Us] += popcount(bb); } + if (Pt == QUEEN) + b &= ~( ei.attackedBy[Them][KNIGHT] + | ei.attackedBy[Them][BISHOP] + | ei.attackedBy[Them][ROOK]); + int mob = Pt != QUEEN ? popcount(b & mobilityArea) : popcount(b & mobilityArea); @@ -516,23 +516,21 @@ Value do_evaluate(const Position& pos) { score += MinorBehindPawn; } - if ( (Pt == ROOK || Pt == QUEEN) - && relative_rank(Us, s) >= RANK_5) + if (Pt == ROOK) { - // Major piece on 7th rank and enemy king trapped on 8th + // Rook on 7th rank and enemy king trapped on 8th if ( relative_rank(Us, s) == RANK_7 && relative_rank(Us, pos.king_square(Them)) == RANK_8) - score += Pt == ROOK ? RookOn7th : QueenOn7th; + score += RookOn7th; - // Major piece attacking enemy pawns on the same rank/file - Bitboard pawns = pos.pieces(Them, PAWN) & PseudoAttacks[ROOK][s]; - if (pawns) - score += popcount(pawns) * (Pt == ROOK ? RookOnPawn : QueenOnPawn); - } + // Rook piece attacking enemy pawns on the same rank/file + if (relative_rank(Us, s) >= RANK_5) + { + Bitboard pawns = pos.pieces(Them, PAWN) & PseudoAttacks[ROOK][s]; + if (pawns) + score += popcount(pawns) * RookOnPawn; + } - // Special extra evaluation for rooks - if (Pt == ROOK) - { // Give a bonus for a rook on a open or semi-open file if (ei.pi->semiopen(Us, file_of(s))) score += ei.pi->semiopen(Them, file_of(s)) ? RookOpenFile : RookSemiopenFile; @@ -572,28 +570,39 @@ Value do_evaluate(const Position& pos) { } - // evaluate_pieces() assigns bonuses and penalties to all the - // pieces of a given color. + // evaluate_pieces() assigns bonuses and penalties to all the pieces of both colors - template + template Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility) { - const Color Them = (Us == WHITE ? BLACK : WHITE); - // Do not include in mobility squares protected by enemy pawns or occupied by our pieces - const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces(Us, PAWN, KING)); + const Bitboard whiteMobilityArea = ~(ei.attackedBy[BLACK][PAWN] | pos.pieces(WHITE, PAWN, KING)); + const Bitboard blackMobilityArea = ~(ei.attackedBy[WHITE][PAWN] | pos.pieces(BLACK, PAWN, KING)); + + Score score; - Score score = evaluate_pieces(pos, ei, mobility, mobilityArea) - + evaluate_pieces(pos, ei, mobility, mobilityArea) - + evaluate_pieces(pos, ei, mobility, mobilityArea) - + evaluate_pieces(pos, ei, mobility, mobilityArea); + score = evaluate_pieces(pos, ei, mobility, whiteMobilityArea) + - evaluate_pieces(pos, ei, mobility, blackMobilityArea); + score += evaluate_pieces(pos, ei, mobility, whiteMobilityArea) + - evaluate_pieces(pos, ei, mobility, blackMobilityArea); + score += evaluate_pieces< ROOK, WHITE, Trace>(pos, ei, mobility, whiteMobilityArea) + - evaluate_pieces< ROOK, BLACK, Trace>(pos, ei, mobility, blackMobilityArea); + score += evaluate_pieces< QUEEN, WHITE, Trace>(pos, ei, mobility, whiteMobilityArea) + - evaluate_pieces< QUEEN, BLACK, Trace>(pos, ei, mobility, blackMobilityArea); // Sum up all attacked squares (updated in evaluate_pieces) - ei.attackedBy[Us][ALL_PIECES] = ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT] - | ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK] - | ei.attackedBy[Us][QUEEN] | ei.attackedBy[Us][KING]; + ei.attackedBy[WHITE][ALL_PIECES] = ei.attackedBy[WHITE][PAWN] | ei.attackedBy[WHITE][KNIGHT] + | ei.attackedBy[WHITE][BISHOP] | ei.attackedBy[WHITE][ROOK] + | ei.attackedBy[WHITE][QUEEN] | ei.attackedBy[WHITE][KING]; + + ei.attackedBy[BLACK][ALL_PIECES] = ei.attackedBy[BLACK][PAWN] | ei.attackedBy[BLACK][KNIGHT] + | ei.attackedBy[BLACK][BISHOP] | ei.attackedBy[BLACK][ROOK] + | ei.attackedBy[BLACK][QUEEN] | ei.attackedBy[BLACK][KING]; if (Trace) - Tracing::terms[Us][Tracing::MOBILITY] = apply_weight(mobility[Us], Weights[Mobility]); + { + Tracing::terms[WHITE][Tracing::MOBILITY] = apply_weight(mobility[WHITE], Weights[Mobility]); + Tracing::terms[BLACK][Tracing::MOBILITY] = apply_weight(mobility[BLACK], Weights[Mobility]); + } return score; } @@ -631,6 +640,7 @@ Value do_evaluate(const Position& pos) { // the pawn shelter (current 'score' value). attackUnits = std::min(20, (ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them]) / 2) + 3 * (ei.kingAdjacentZoneAttacksCount[Them] + popcount(undefended)) + + 2 * (ei.pinnedPieces[Us] != 0) - mg_value(score) / 32; // Analyse the enemy's safe queen contact checks. Firstly, find the @@ -695,10 +705,6 @@ Value do_evaluate(const Position& pos) { if (b) attackUnits += KnightCheck * popcount(b); - // Penalty for pinned pieces not defended by a pawn - if (ei.pinnedPieces[Us] & ~ei.attackedBy[Us][PAWN]) - attackUnits += UnsupportedPinnedPiece; - // To index KingDanger[] attackUnits must be in [0, 99] range attackUnits = std::min(99, std::max(0, attackUnits)); @@ -930,28 +936,25 @@ Value do_evaluate(const Position& pos) { } // apply_weight() weights score v by score w trying to prevent overflow - Score apply_weight(Score v, Score w) { + Score apply_weight(Score v, const Weight& w) { - return make_score((int(mg_value(v)) * mg_value(w)) / 0x100, - (int(eg_value(v)) * eg_value(w)) / 0x100); + return make_score(mg_value(v) * w.mg / 256, eg_value(v) * w.eg / 256); } // weight_option() computes the value of an evaluation weight, by combining // two UCI-configurable weights (midgame and endgame) with an internal weight. - Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) { - - // Scale option value from 100 to 256 - int mg = Options[mgOpt] * 256 / 100; - int eg = Options[egOpt] * 256 / 100; + Weight weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) { - return apply_weight(make_score(mg, eg), internalWeight); + Weight w = { Options[mgOpt] * mg_value(internalWeight) / 100, + Options[egOpt] * eg_value(internalWeight) / 100 }; + return w; } // Tracing function definitions - double Tracing::to_cp(Value v) { return double(v) / PawnValueMg; } + double Tracing::to_cp(Value v) { return double(v) / PawnValueEg; } void Tracing::add_term(int idx, Score wScore, Score bScore) {