X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=e44bcdcc64aa942f0bb6206f87dad3543f809631;hp=1036b47939bae402ab25694237ae21de3d7014c2;hb=0d207ec2c643603c9891880815d6427a98c20f1d;hpb=c0334c7bac92fe0569dc61d1af63a8cc07e2020f diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 1036b479..e44bcdcc 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -133,12 +133,11 @@ namespace { // ThreatBonus[attacking][attacked] contains bonus according to which // piece type attacks which one. const Score ThreatBonus[8][8] = { - {}, - { S(0, 0), S(18,37), S( 0, 0), S(37,47), S(55,97), S(55,97) }, // KNIGHT - { S(0, 0), S(18,37), S(37,47), S( 0, 0), S(55,97), S(55,97) }, // BISHOP - { S(0, 0), S( 9,27), S(27,47), S(27,47), S( 0, 0), S(37,47) }, // ROOK - { S(0, 0), S(27,37), S(27,37), S(27,37), S(27,37), S( 0, 0) }, // QUEEN - {}, {}, {} + {}, {}, + { S(0, 0), S( 7, 39), S( 0, 0), S(24, 49), S(41,100), S(41,100) }, // KNIGHT + { S(0, 0), S( 7, 39), S(24, 49), S( 0, 0), S(41,100), S(41,100) }, // BISHOP + { S(0, 0), S(-1, 29), S(15, 49), S(15, 49), S( 0, 0), S(24, 49) }, // ROOK + { S(0, 0), S(15, 39), S(15, 39), S(15, 39), S(15, 39), S( 0, 0) } // QUEEN }; // ThreatedByPawnPenalty[] contains a penalty according to which piece @@ -214,12 +213,6 @@ namespace { const int BishopCheckBonus = 1; const int KnightCheckBonus = 1; - // Scan for queen contact mates? - const bool QueenContactMates = true; - - // Bonus for having a mate threat - const int MateThreatBonus = 3; - // InitKingDanger[] contains bonuses based on the position of the defending // king. const int InitKingDanger[64] = { @@ -418,11 +411,7 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { } // Interpolate between the middle game and the endgame score - Color stm = pos.side_to_move(); - - Value v = Sign[stm] * scale_by_game_phase(ei.value, phase, factor); - - return (ei.mateThreat[stm] == MOVE_NONE ? v : 8 * QueenValueMidgame - v); + return Sign[pos.side_to_move()] * scale_by_game_phase(ei.value, phase, factor); } } // namespace @@ -567,7 +556,7 @@ namespace { ei.value -= Sign[Us] * ThreatedByPawnPenalty[Piece]; // Bishop and knight outposts squares - if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, Them)) + if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, Us)) evaluate_outposts(pos, ei, s); // Special patterns: trapped bishops on a7/h7/a2/h2 @@ -695,8 +684,7 @@ namespace { const Color Them = (Us == WHITE ? BLACK : WHITE); - Bitboard undefended, attackedByOthers, escapeSquares, occ, b, b1, b2, safe; - Square from, to; + Bitboard undefended, b, b1, b2, safe; bool sente; int attackUnits, shelter = 0; const Square ksq = pos.king_square(Us); @@ -711,8 +699,8 @@ namespace { // King safety. This is quite complicated, and is almost certainly far // from optimally tuned. if ( pos.piece_count(Them, QUEEN) >= 1 - && ei.kingAttackersCount[Them] >= 2 - && pos.non_pawn_material(Them) >= QueenValueMidgame + RookValueMidgame + && ei.kingAttackersCount[Them] >= 2 + && pos.non_pawn_material(Them) >= QueenValueMidgame + RookValueMidgame && ei.kingAdjacentZoneAttacksCount[Them]) { // Is it the attackers turn to move? @@ -735,60 +723,29 @@ namespace { + InitKingDanger[relative_square(Us, ksq)] - shelter / 32; - // Analyse safe queen contact checks + // Analyse enemy's safe queen contact checks. First find undefended + // squares around the king attacked by enemy queen... b = undefended & ei.attacked_by(Them, QUEEN) & ~pos.pieces_of_color(Them); if (b) { - attackedByOthers = ei.attacked_by(Them, PAWN) | ei.attacked_by(Them, KNIGHT) - | ei.attacked_by(Them, BISHOP) | ei.attacked_by(Them, ROOK); - - b &= attackedByOthers; - - // Squares attacked by the queen and supported by another enemy piece and - // not defended by other pieces but our king. + // ...then remove squares not supported by another enemy piece + b &= ( ei.attacked_by(Them, PAWN) | ei.attacked_by(Them, KNIGHT) + | ei.attacked_by(Them, BISHOP) | ei.attacked_by(Them, ROOK)); if (b) - { - // The bitboard b now contains the squares available for safe queen - // contact checks. attackUnits += QueenContactCheckBonus * count_1s_max_15(b) * (sente ? 2 : 1); - - // Is there a mate threat? - if (QueenContactMates && !pos.is_check()) - { - escapeSquares = pos.attacks_from(ksq) & ~pos.pieces_of_color(Us) & ~attackedByOthers; - occ = pos.occupied_squares(); - while (b) - { - to = pop_1st_bit(&b); - - // Do we have escape squares from queen contact check attack ? - if (!(escapeSquares & ~queen_attacks_bb(to, occ & ClearMaskBB[ksq]))) - { - // We have a mate, unless the queen is pinned or there - // is an X-ray attack through the queen. - for (int i = 0; i < pos.piece_count(Them, QUEEN); i++) - { - from = pos.piece_list(Them, QUEEN, i); - if ( bit_is_set(pos.attacks_from(from), to) - && !bit_is_set(pos.pinned_pieces(Them), from) - && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & pos.pieces(ROOK, QUEEN, Us)) - && !(bishop_attacks_bb(to, occ & ClearMaskBB[from]) & pos.pieces(BISHOP, QUEEN, Us))) - - // Set the mate threat move - ei.mateThreat[Them] = make_move(from, to); - } - } - } - } - } } - // Analyse enemy's safe distance checks + // Analyse enemy's safe distance checks for sliders and knights safe = ~(pos.pieces_of_color(Them) | ei.attacked_by(Us)); b1 = pos.attacks_from(ksq) & safe; b2 = pos.attacks_from(ksq) & safe; + // Enemy queen safe checks + b = (b1 | b2) & ei.attacked_by(Them, QUEEN); + if (b) + attackUnits += QueenCheckBonus * count_1s_max_15(b); + // Enemy rooks safe checks b = b1 & ei.attacked_by(Them, ROOK); if (b) @@ -799,31 +756,12 @@ namespace { if (b) attackUnits += BishopCheckBonus * count_1s_max_15(b); - // Enemy queens safe checks - b = (b1 | b2) & ei.attacked_by(Them, QUEEN); - if (b) - attackUnits += QueenCheckBonus * count_1s_max_15(b); - // Enemy knights safe checks b = pos.attacks_from(ksq) & ei.attacked_by(Them, KNIGHT) & safe; if (b) attackUnits += KnightCheckBonus * count_1s_max_15(b); - // Analyse discovered checks (only for non-pawns right now, consider - // adding pawns later). - b = pos.discovered_check_candidates(Them) & ~pos.pieces(PAWN); - if (b) - attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente ? 2 : 1); - - // Has a mate threat been found? We don't do anything here if the - // side with the mating move is the side to move, because in that - // case the mating side will get a huge bonus at the end of the main - // evaluation function instead. - if (ei.mateThreat[Them] != MOVE_NONE) - attackUnits += MateThreatBonus; - - // Ensure that attackUnits is between 0 and 99, in order to avoid array - // out of bounds errors. + // To index KingDangerTable[] attackUnits must be in [0, 99] range attackUnits = Min(99, Max(0, attackUnits)); // Finally, extract the king danger score from the KingDangerTable[] @@ -844,6 +782,7 @@ namespace { const Color Them = (Us == WHITE ? BLACK : WHITE); + Bitboard squaresToQueen, defendedSquares, unsafeSquares, supportingPawns; Bitboard b = ei.pi->passed_pawns() & pos.pieces_of_color(Us); while (b) @@ -854,17 +793,17 @@ namespace { assert(pos.pawn_is_passed(Us, s)); int r = int(relative_rank(Us, s) - RANK_2); - int tr = Max(0, r * (r - 1)); + int tr = r * (r - 1); // Base bonus based on rank Value mbonus = Value(20 * tr); Value ebonus = Value(10 + r * r * 10); - // Adjust bonus based on king proximity if (tr) { Square blockSq = s + pawn_push(Us); + // Adjust bonus based on kings proximity ebonus -= Value(square_distance(pos.king_square(Us), blockSq) * 3 * tr); ebonus -= Value(square_distance(pos.king_square(Us), blockSq + pawn_push(Us)) * 1 * tr); ebonus += Value(square_distance(pos.king_square(Them), blockSq) * 6 * tr); @@ -872,47 +811,45 @@ namespace { // If the pawn is free to advance, increase bonus if (pos.square_is_empty(blockSq)) { - // There are no enemy pawns in the pawn's path - Bitboard b2 = squares_in_front_of(Us, s); - - assert((b2 & pos.pieces(PAWN, Them)) == EmptyBoardBB); + squaresToQueen = squares_in_front_of(Us, s); + defendedSquares = squaresToQueen & ei.attacked_by(Us); - // Squares attacked by us - Bitboard b4 = b2 & ei.attacked_by(Us); - - // Squares attacked or occupied by enemy pieces - Bitboard b3 = b2 & (ei.attacked_by(Them) | pos.pieces_of_color(Them)); + // There are no enemy pawns in the pawn's path + assert(!(squaresToQueen & pos.pieces(PAWN, Them))); // If there is an enemy rook or queen attacking the pawn from behind, - // add all X-ray attacks by the rook or queen. + // add all X-ray attacks by the rook or queen. Otherwise consider only + // the squares in the pawn's path attacked or occupied by the enemy. if ( (squares_behind(Us, s) & pos.pieces(ROOK, QUEEN, Them)) && (squares_behind(Us, s) & pos.pieces(ROOK, QUEEN, Them) & pos.attacks_from(s))) - b3 = b2; + unsafeSquares = squaresToQueen; + else + unsafeSquares = squaresToQueen & (ei.attacked_by(Them) | pos.pieces_of_color(Them)); - // Are any of the squares in the pawn's path attacked or occupied by the enemy? - if (b3 == EmptyBoardBB) - // No enemy attacks or pieces, huge bonus! - // Even bigger if we protect the pawn's path - ebonus += Value(tr * (b2 == b4 ? 17 : 15)); + // If there aren't enemy attacks or pieces along the path to queen give + // huge bonus. Even bigger if we protect the pawn's path. + if (!unsafeSquares) + ebonus += Value(tr * (squaresToQueen == defendedSquares ? 17 : 15)); else // OK, there are enemy attacks or pieces (but not pawns). Are those // squares which are attacked by the enemy also attacked by us ? // If yes, big bonus (but smaller than when there are no enemy attacks), // if no, somewhat smaller bonus. - ebonus += Value(tr * ((b3 & b4) == b3 ? 13 : 8)); + ebonus += Value(tr * ((unsafeSquares & defendedSquares) == unsafeSquares ? 13 : 8)); // At last, add a small bonus when there are no *friendly* pieces // in the pawn's path. - if ((b2 & pos.pieces_of_color(Us)) == EmptyBoardBB) + if (!(squaresToQueen & pos.pieces_of_color(Us))) ebonus += Value(tr); } } // tr != 0 - // If the pawn is supported by a friendly pawn, increase bonus - Bitboard b1 = pos.pieces(PAWN, Us) & neighboring_files_bb(s); - if (b1 & rank_bb(s)) + // Increase the bonus if the passed pawn is supported by a friendly pawn + // on the same rank and a bit smaller if it's on the previous rank. + supportingPawns = pos.pieces(PAWN, Us) & neighboring_files_bb(s); + if (supportingPawns & rank_bb(s)) ebonus += Value(r * 20); - else if (pos.attacks_from(s, Them) & b1) + else if (supportingPawns & rank_bb(s - pawn_push(Us))) ebonus += Value(r * 12); // Rook pawns are a special case: They are sometimes worse, and @@ -1103,14 +1040,12 @@ namespace { // Find the safe squares for our pieces inside the area defined by // SpaceMask[us]. A square is unsafe if it is attacked by an enemy // pawn, or if it is undefended and attacked by an enemy piece. - Bitboard safeSquares = SpaceMask[Us] & ~pos.pieces(PAWN, Us) & ~ei.attacked_by(Them, PAWN) - & ~(~ei.attacked_by(Us) & ei.attacked_by(Them)); + & (ei.attacked_by(Us) | ~ei.attacked_by(Them)); - // Find all squares which are at most three squares behind some friendly - // pawn. + // Find all squares which are at most three squares behind some friendly pawn Bitboard behindFriendlyPawns = pos.pieces(PAWN, Us); behindFriendlyPawns |= (Us == WHITE ? behindFriendlyPawns >> 8 : behindFriendlyPawns << 8); behindFriendlyPawns |= (Us == WHITE ? behindFriendlyPawns >> 16 : behindFriendlyPawns << 16); @@ -1151,17 +1086,11 @@ namespace { Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) { - Score uciWeight = make_score(get_option_value_int(mgOpt), get_option_value_int(egOpt)); + // Scale option value from 100 to 256 + int mg = get_option_value_int(mgOpt) * 256 / 100; + int eg = get_option_value_int(egOpt) * 256 / 100; - // Convert to integer to prevent overflow - int mg = mg_value(uciWeight); - int eg = eg_value(uciWeight); - - mg = (mg * 0x100) / 100; - eg = (eg * 0x100) / 100; - mg = (mg * mg_value(internalWeight)) / 0x100; - eg = (eg * eg_value(internalWeight)) / 0x100; - return make_score(mg, eg); + return apply_weight(make_score(mg, eg), internalWeight); } // init_safety() initizes the king safety evaluation, based on UCI @@ -1169,28 +1098,19 @@ namespace { void init_safety() { - int maxSlope = 30; - int peak = 0x500; - double a = 0.4; - double b = 0.0; + const Value MaxSlope = Value(30); + const Value Peak = Value(1280); Value t[100]; // First setup the base table for (int i = 0; i < 100; i++) { - if (i < b) - t[i] = Value(0); - else - t[i] = Value((int)(a * (i - b) * (i - b))); - } + t[i] = Value(int(0.4 * i * i)); - for (int i = 1; i < 100; i++) - { - if (t[i] - t[i - 1] > maxSlope) - t[i] = t[i - 1] + Value(maxSlope); + if (i > 0) + t[i] = Min(t[i], t[i - 1] + MaxSlope); - if (t[i] > Value(peak)) - t[i] = Value(peak); + t[i] = Min(t[i], Peak); } // Then apply the weights and get the final KingDangerTable[] array