X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=fe964935c828282490b53a3927cc18c471f263d1;hp=cb03ba25ced51d02b0b9b8ca7914d59ff486ac9e;hb=caa02b0e43dbce0c723bc6499aab811ca3e5408e;hpb=045beac156a97669d3d4ddbc53eceae4be1e5186 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index cb03ba25..fe964935 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -45,11 +45,6 @@ namespace { // Pointer to pawn hash table entry PawnInfo* pi; - // updateKingTables[color] is set to true if we have enough material - // to trigger the opponent's king safety calculation. When is false we - // skip the time consuming update of the king attackers tables. - bool updateKingTables[2]; - // attackedBy[color][piece type] is a bitboard representing all squares // attacked by a given color and piece type, attackedBy[color][0] contains // all squares attacked by the given color. @@ -133,18 +128,14 @@ namespace { V(0), V(0), V(4), V(8), V(8), V(4), V(0), V(0), V(0), V(4),V(17),V(26),V(26),V(17), V(4), V(0), V(0), V(8),V(26),V(35),V(35),V(26), V(8), V(0), - V(0), V(4),V(17),V(17),V(17),V(17), V(4), V(0), - V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), - V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) }, + V(0), V(4),V(17),V(17),V(17),V(17), V(4), V(0) }, { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Bishops V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(5), V(5), V(5), V(5), V(0), V(0), V(0), V(5),V(10),V(10),V(10),V(10), V(5), V(0), V(0),V(10),V(21),V(21),V(21),V(21),V(10), V(0), - V(0), V(5), V(8), V(8), V(8), V(8), V(5), V(0), - V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), - V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) } + V(0), V(5), V(8), V(8), V(8), V(8), V(5), V(0) } }; // ThreatBonus[attacking][attacked] contains threat bonuses according to @@ -177,6 +168,11 @@ namespace { // right to castle. const Value TrappedRookPenalty = Value(180); + // Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by + // a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only + // happen in Chess960 games. + const Score TrappedBishopA1H1Penalty = make_score(100, 100); + // The SpaceMask[Color] contains the area of the board which is considered // by the space evaluation. In the middle game, each side is given a bonus // based on how many squares inside this area are safe and available for @@ -239,7 +235,7 @@ namespace { Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei, Score& mobility); template - Score evaluate_king(const Position& pos, EvalInfo& ei, Value& margin); + Score evaluate_king(const Position& pos, EvalInfo& ei, Value margins[]); template Score evaluate_threats(const Position& pos, EvalInfo& ei); @@ -250,7 +246,10 @@ namespace { template Score evaluate_passed_pawns(const Position& pos, EvalInfo& ei); - Score apply_weight(Score v, Score weight); + template + Score evaluate_unstoppable_pawns(const Position& pos, EvalInfo& ei); + + inline Score apply_weight(Score v, Score weight); Value scale_by_game_phase(const Score& v, Phase ph, ScaleFactor sf); Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight); void init_safety(); @@ -285,6 +284,7 @@ template Value do_evaluate(const Position& pos, Value& margin) { EvalInfo ei; + Value margins[2]; Score mobilityWhite, mobilityBlack; assert(pos.is_ok()); @@ -295,9 +295,9 @@ Value do_evaluate(const Position& pos, Value& margin) { // in the position object (material + piece square tables). Score bonus = pos.value(); - // margin is the uncertainty estimation of position's evaluation - // and typically is used by the search for pruning decisions. - margin = VALUE_ZERO; + // margins[] store the uncertainty estimation of position's evaluation + // that typically is used by the search for pruning decisions. + margins[WHITE] = margins[BLACK] = VALUE_ZERO; // Probe the material hash table MaterialInfo* mi = MaterialTable[pos.thread()]->get_material_info(pos); @@ -306,7 +306,10 @@ Value do_evaluate(const Position& pos, Value& margin) { // If we have a specialized evaluation function for the current material // configuration, call it and return. if (mi->specialized_eval_exists()) + { + margin = VALUE_ZERO; return mi->evaluate(pos); + } // Probe the pawn hash table ei.pi = PawnTable[pos.thread()]->get_pawn_info(pos); @@ -324,8 +327,8 @@ Value do_evaluate(const Position& pos, Value& margin) { // Evaluate kings after all other pieces because we need complete attack // information when computing the king safety evaluation. - bonus += evaluate_king(pos, ei, margin) - - evaluate_king(pos, ei, margin); + bonus += evaluate_king(pos, ei, margins) + - evaluate_king(pos, ei, margins); // Evaluate tactical threats, we need full attack information including king bonus += evaluate_threats(pos, ei) @@ -335,18 +338,21 @@ Value do_evaluate(const Position& pos, Value& margin) { bonus += evaluate_passed_pawns(pos, ei) - evaluate_passed_pawns(pos, ei); - Phase phase = mi->game_phase(); + // If one side has only a king, check whether exists any unstoppable passed pawn + if (!pos.non_pawn_material(WHITE) || !pos.non_pawn_material(BLACK)) + bonus += evaluate_unstoppable_pawns(pos, ei); // Evaluate space for both sides, only in middle-game. - if (phase > PHASE_ENDGAME && mi->space_weight() > 0) + if (mi->space_weight()) { int s = evaluate_space(pos, ei) - evaluate_space(pos, ei); bonus += apply_weight(make_score(s * mi->space_weight(), 0), Weights[Space]); } // Scale winning side if position is more drawish that what it appears - ScaleFactor sf = eg_value(bonus) > VALUE_ZERO ? mi->scale_factor(pos, WHITE) + ScaleFactor sf = eg_value(bonus) > VALUE_DRAW ? mi->scale_factor(pos, WHITE) : mi->scale_factor(pos, BLACK); + Phase phase = mi->game_phase(); // If we don't already have an unusual scale factor, check for opposite // colored bishop endgames, and use a lower scale for those. @@ -370,6 +376,7 @@ Value do_evaluate(const Position& pos, Value& margin) { } // Interpolate between the middle game and the endgame score + margin = margins[pos.side_to_move()]; Value v = scale_by_game_phase(bonus, phase, sf); return pos.side_to_move() == WHITE ? v : -v; } @@ -412,7 +419,7 @@ void quit_eval() { /// read_weights() reads evaluation weights from the corresponding UCI parameters -void read_weights(Color us) { +void read_evaluation_uci_options(Color us) { // King safety is asymmetrical. Our king danger level is weighted by // "Cowardice" UCI parameter, instead the opponent one by "Aggressiveness". @@ -428,7 +435,7 @@ void read_weights(Color us) { // If running in analysis mode, make sure we use symmetrical king safety. We do this // by replacing both Weights[kingDangerUs] and Weights[kingDangerThem] by their average. - if (get_option_value_bool("UCI_AnalyseMode")) + if (Options["UCI_AnalyseMode"].value()) Weights[kingDangerUs] = Weights[kingDangerThem] = (Weights[kingDangerUs] + Weights[kingDangerThem]) / 2; init_safety(); @@ -443,18 +450,22 @@ namespace { template void init_eval_info(const Position& pos, EvalInfo& ei) { + const BitCountType Max15 = HasPopCnt ? CNT_POPCNT : CpuIs64Bit ? CNT64_MAX15 : CNT32_MAX15; const Color Them = (Us == WHITE ? BLACK : WHITE); Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from(pos.king_square(Them)); - ei.kingZone[Us] = (b | (Us == WHITE ? b >> 8 : b << 8)); ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us); - ei.updateKingTables[Us] = pos.piece_count(Us, QUEEN) && pos.non_pawn_material(Us) >= QueenValueMidgame + RookValueMidgame; - if (ei.updateKingTables[Us]) + + // Init king safety tables only if we are going to use them + if ( pos.piece_count(Us, QUEEN) + && pos.non_pawn_material(Us) >= QueenValueMidgame + RookValueMidgame) { + ei.kingZone[Us] = (b | (Us == WHITE ? b >> 8 : b << 8)); b &= ei.attackedBy[Us][PAWN]; - ei.kingAttackersCount[Us] = b ? count_1s_max_15(b) / 2 : EmptyBoardBB; - ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = EmptyBoardBB; - } + ei.kingAttackersCount[Us] = b ? count_1s(b) / 2 : 0; + ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0; + } else + ei.kingZone[Us] = ei.kingAttackersCount[Us] = 0; } @@ -495,6 +506,8 @@ namespace { File f; Score bonus = SCORE_ZERO; + const BitCountType Full = HasPopCnt ? CNT_POPCNT : CpuIs64Bit ? CNT64 : CNT32; + const BitCountType Max15 = HasPopCnt ? CNT_POPCNT : CpuIs64Bit ? CNT64_MAX15 : CNT32_MAX15; const Color Them = (Us == WHITE ? BLACK : WHITE); const Square* ptr = pos.piece_list_begin(Us, Piece); @@ -516,18 +529,18 @@ namespace { ei.attackedBy[Us][Piece] |= b; // King attacks - if (ei.updateKingTables[Us] && (b & ei.kingZone[Us])) + if (b & ei.kingZone[Us]) { ei.kingAttackersCount[Us]++; ei.kingAttackersWeight[Us] += KingAttackWeights[Piece]; Bitboard bb = (b & ei.attackedBy[Them][KING]); if (bb) - ei.kingAdjacentZoneAttacksCount[Us] += count_1s_max_15(bb); + ei.kingAdjacentZoneAttacksCount[Us] += count_1s(bb); } // Mobility - mob = (Piece != QUEEN ? count_1s_max_15(b & mobilityArea) - : count_1s(b & mobilityArea)); + mob = (Piece != QUEEN ? count_1s(b & mobilityArea) + : count_1s(b & mobilityArea)); mobility += MobilityBonus[Piece][mob]; @@ -548,6 +561,28 @@ namespace { bonus += (Piece == ROOK ? RookOn7thBonus : QueenOn7thBonus); } + // Special extra evaluation for bishops + if (Piece == BISHOP && pos.is_chess960()) + { + // An important Chess960 pattern: A cornered bishop blocked by + // a friendly pawn diagonally in front of it is a very serious + // problem, especially when that pawn is also blocked. + if (s == relative_square(Us, SQ_A1) || s == relative_square(Us, SQ_H1)) + { + SquareDelta d = pawn_push(Us) + + (square_file(s) == FILE_A ? DELTA_E : DELTA_W); + if (pos.piece_on(s + d) == piece_of_color_and_type(Us, PAWN)) + { + if (!pos.square_is_empty(s + d + pawn_push(Us))) + bonus -= 2*TrappedBishopA1H1Penalty; + else if (pos.piece_on(s + 2*d) == piece_of_color_and_type(Us, PAWN)) + bonus -= TrappedBishopA1H1Penalty; + else + bonus -= TrappedBishopA1H1Penalty / 2; + } + } + } + // Special extra evaluation for rooks if (Piece == ROOK) { @@ -654,8 +689,9 @@ namespace { // evaluate_king<>() assigns bonuses and penalties to a king of a given color template - Score evaluate_king(const Position& pos, EvalInfo& ei, Value& margin) { + Score evaluate_king(const Position& pos, EvalInfo& ei, Value margins[]) { + const BitCountType Max15 = HasPopCnt ? CNT_POPCNT : CpuIs64Bit ? CNT64_MAX15 : CNT32_MAX15; const Color Them = (Us == WHITE ? BLACK : WHITE); Bitboard undefended, b, b1, b2, safe; @@ -667,8 +703,7 @@ namespace { // King safety. This is quite complicated, and is almost certainly far // from optimally tuned. - if ( ei.updateKingTables[Them] - && ei.kingAttackersCount[Them] >= 2 + if ( ei.kingAttackersCount[Them] >= 2 && ei.kingAdjacentZoneAttacksCount[Them]) { // Find the attacked squares around the king which has no defenders @@ -684,7 +719,7 @@ namespace { // attacked and undefended squares around our king, the square of the // king, and the quality of the pawn shelter. attackUnits = Min(25, (ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them]) / 2) - + 3 * (ei.kingAdjacentZoneAttacksCount[Them] + count_1s_max_15(undefended)) + + 3 * (ei.kingAdjacentZoneAttacksCount[Them] + count_1s(undefended)) + InitKingDanger[relative_square(Us, ksq)] - mg_value(ei.pi->king_shelter(pos, ksq)) / 32; @@ -698,7 +733,7 @@ namespace { | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][ROOK]); if (b) attackUnits += QueenContactCheckBonus - * count_1s_max_15(b) + * count_1s(b) * (Them == pos.side_to_move() ? 2 : 1); } @@ -716,7 +751,7 @@ namespace { | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][QUEEN]); if (b) attackUnits += RookContactCheckBonus - * count_1s_max_15(b) + * count_1s(b) * (Them == pos.side_to_move() ? 2 : 1); } @@ -729,22 +764,22 @@ namespace { // Enemy queen safe checks b = (b1 | b2) & ei.attackedBy[Them][QUEEN]; if (b) - attackUnits += QueenCheckBonus * count_1s_max_15(b); + attackUnits += QueenCheckBonus * count_1s(b); // Enemy rooks safe checks b = b1 & ei.attackedBy[Them][ROOK]; if (b) - attackUnits += RookCheckBonus * count_1s_max_15(b); + attackUnits += RookCheckBonus * count_1s(b); // Enemy bishops safe checks b = b2 & ei.attackedBy[Them][BISHOP]; if (b) - attackUnits += BishopCheckBonus * count_1s_max_15(b); + attackUnits += BishopCheckBonus * count_1s(b); // Enemy knights safe checks b = pos.attacks_from(ksq) & ei.attackedBy[Them][KNIGHT] & safe; if (b) - attackUnits += KnightCheckBonus * count_1s_max_15(b); + attackUnits += KnightCheckBonus * count_1s(b); // To index KingDangerTable[] attackUnits must be in [0, 99] range attackUnits = Min(99, Max(0, attackUnits)); @@ -755,8 +790,7 @@ namespace { // be very big, and so capturing a single attacking piece can therefore // result in a score change far bigger than the value of the captured piece. bonus -= KingDangerTable[Us][attackUnits]; - if (pos.side_to_move() == Us) - margin += mg_value(KingDangerTable[Us][attackUnits]); + margins[Us] += mg_value(KingDangerTable[Us][attackUnits]); } return bonus; } @@ -859,6 +893,168 @@ namespace { return apply_weight(bonus, Weights[PassedPawns]); } + // evaluate_unstoppable_pawns() evaluates the unstoppable passed pawns for both sides + template + Score evaluate_unstoppable_pawns(const Position& pos, EvalInfo& ei) { + + const BitCountType Max15 = HasPopCnt ? CNT_POPCNT : CpuIs64Bit ? CNT64_MAX15 : CNT32_MAX15; + + // Step 1. Hunt for unstoppable pawns. If we find at least one, record how many plies + // are required for promotion + int pliesToGo[2] = {256, 256}; + + for (Color c = WHITE; c <= BLACK; c++) + { + // Skip if other side has non-pawn pieces + if (pos.non_pawn_material(opposite_color(c))) + continue; + + Bitboard b = ei.pi->passed_pawns(c); + + while (b) + { + Square s = pop_1st_bit(&b); + Square queeningSquare = relative_square(c, make_square(square_file(s), RANK_8)); + + int mtg = RANK_8 - relative_rank(c, s) - int(relative_rank(c, s) == RANK_2); + int oppmtg = square_distance(pos.king_square(opposite_color(c)), queeningSquare) - int(c != pos.side_to_move()); + bool pathDefended = ((ei.attackedBy[c][0] & squares_in_front_of(c, s)) == squares_in_front_of(c, s)); + + if (mtg >= oppmtg && !pathDefended) + continue; + + int blockerCount = count_1s(squares_in_front_of(c, s) & pos.occupied_squares()); + mtg += blockerCount; + + if (mtg >= oppmtg && !pathDefended) + continue; + + int ptg = 2 * mtg - int(c == pos.side_to_move()); + + if (ptg < pliesToGo[c]) + pliesToGo[c] = ptg; + } + } + + // Step 2. If either side cannot promote at least three plies before the other side then + // situation becomes too complex and we give up. Otherwise we determine the possibly "winning side" + if (abs(pliesToGo[WHITE] - pliesToGo[BLACK]) < 3) + return make_score(0, 0); + + Color winnerSide = (pliesToGo[WHITE] < pliesToGo[BLACK] ? WHITE : BLACK); + Color loserSide = opposite_color(winnerSide); + + // Step 3. Can the losing side possibly create a new passed pawn and thus prevent the loss? + // We collect the potential candidates in potentialBB. + Bitboard pawnBB = pos.pieces(PAWN, loserSide); + Bitboard potentialBB = pawnBB; + const Bitboard passedBB = ei.pi->passed_pawns(loserSide); + + while(pawnBB) + { + Square psq = pop_1st_bit(&pawnBB); + + // Check direct advancement + int mtg = RANK_8 - relative_rank(loserSide, psq) - int(relative_rank(loserSide, psq) == RANK_2); + int ptg = 2 * mtg - int(loserSide == pos.side_to_move()); + + // Check if (without even considering any obstacles) we're too far away + if (pliesToGo[winnerSide] + 3 <= ptg) + { + clear_bit(&potentialBB, psq); + continue; + } + + // If this is passed pawn, then it _may_ promote in time. We give up. + if (bit_is_set(passedBB, psq)) + return make_score(0, 0); + + // Doubled pawn is worthless + if (squares_in_front_of(loserSide, psq) & (pos.pieces(PAWN, loserSide))) + { + clear_bit(&potentialBB, psq); + continue; + } + } + + // Step 4. Check new passed pawn creation through king capturing and sacrifises + pawnBB = potentialBB; + + while(pawnBB) + { + Square psq = pop_1st_bit(&pawnBB); + + int mtg = RANK_8 - relative_rank(loserSide, psq) - int(relative_rank(loserSide, psq) == RANK_2); + int ptg = 2 * mtg - int(loserSide == pos.side_to_move()); + + // Generate list of obstacles + Bitboard obsBB = passed_pawn_mask(loserSide, psq) & pos.pieces(PAWN, winnerSide); + const bool pawnIsOpposed = squares_in_front_of(loserSide, psq) & obsBB; + assert(obsBB); + + // How many plies does it take to remove all the obstacles? + int sacptg = 0; + int realObsCount = 0; + int minKingDist = 256; + + while(obsBB) + { + Square obSq = pop_1st_bit(&obsBB); + int minMoves = 256; + + // Check pawns that can give support to overcome obstacle (Eg. wp: a4,b4 bp: b2. b4 is giving support) + if (!pawnIsOpposed && square_file(psq) != square_file(obSq)) + { + Bitboard supBB = in_front_bb(winnerSide, Square(obSq + (winnerSide == WHITE ? 8 : -8))) + & neighboring_files_bb(psq) & potentialBB; + + while(supBB) // This while-loop could be replaced with supSq = LSB/MSB(supBB) (depending on color) + { + Square supSq = pop_1st_bit(&supBB); + int dist = square_distance(obSq, supSq); + minMoves = Min(minMoves, dist - 2); + } + + } + + // Check pawns that can be sacrifised + Bitboard sacBB = passed_pawn_mask(winnerSide, obSq) & neighboring_files_bb(obSq) & potentialBB & ~(1ULL << psq); + + while(sacBB) // This while-loop could be replaced with sacSq = LSB/MSB(sacBB) (depending on color) + { + Square sacSq = pop_1st_bit(&sacBB); + int dist = square_distance(obSq, sacSq); + minMoves = Min(minMoves, dist - 2); + } + + // If obstacle can be destroyed with immediate pawn sacrifise, it's not real obstacle + if (minMoves <= 0) + continue; + + // Pawn sac calculations + sacptg += minMoves * 2; + + // King capture calc + realObsCount++; + int kingDist = square_distance(pos.king_square(loserSide), obSq); + minKingDist = Min(minKingDist, kingDist); + } + + // Check if pawn sac plan _may_ save the day + if (pliesToGo[winnerSide] + 3 > ptg + sacptg) + return make_score(0, 0); + + // Check if king capture plan _may_ save the day (contains some false positives) + int kingptg = (minKingDist + realObsCount) * 2; + if (pliesToGo[winnerSide] + 3 > ptg + kingptg) + return make_score(0, 0); + } + + // Step 5. Assign bonus + const int Sign[2] = {1, -1}; + return Sign[winnerSide] * make_score(0, (Value) 0x500 - 0x20 * pliesToGo[winnerSide]); + } + // evaluate_space() computes the space evaluation for a given side. The // space evaluation is a simple bonus based on the number of safe squares @@ -869,6 +1065,7 @@ namespace { template int evaluate_space(const Position& pos, EvalInfo& ei) { + const BitCountType Max15 = HasPopCnt ? CNT_POPCNT : CpuIs64Bit ? CNT64_MAX15 : CNT32_MAX15; const Color Them = (Us == WHITE ? BLACK : WHITE); // Find the safe squares for our pieces inside the area defined by @@ -884,7 +1081,7 @@ namespace { behind |= (Us == WHITE ? behind >> 8 : behind << 8); behind |= (Us == WHITE ? behind >> 16 : behind << 16); - return count_1s_max_15(safe) + count_1s_max_15(behind & safe); + return count_1s(safe) + count_1s(behind & safe); } @@ -919,8 +1116,8 @@ namespace { Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight) { // 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; + int mg = Options[mgOpt].value() * 256 / 100; + int eg = Options[egOpt].value() * 256 / 100; return apply_weight(make_score(mg, eg), internalWeight); }