X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=38123c9a7edcb21e76a913a0f8d333d1bacbce3e;hb=3107e68c03ed1e227a8058f3cb478862f9c667e4;hp=55c5014a447c7f44c6614815bf49a100e4b4a87d;hpb=6125966da02eab5b726802286ef111c4adc63eab;p=stockfish diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 55c5014a..38123c9a 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -23,7 +23,6 @@ //// #include -#include #include "bitcount.h" #include "evaluate.h" @@ -39,6 +38,48 @@ namespace { + // Struct EvalInfo contains various information computed and collected + // by the evaluation functions. + struct EvalInfo { + + // Middle and end game position's static evaluations + Score value; + + // Pointer to pawn hash table entry + PawnInfo* pi; + + // 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. + Bitboard attackedBy[2][8]; + + // kingZone[color] is the zone around the enemy king which is considered + // by the king safety evaluation. This consists of the squares directly + // adjacent to the king, and the three (or two, for a king on an edge file) + // squares two ranks in front of the king. For instance, if black's king + // is on g8, kingZone[WHITE] is a bitboard containing the squares f8, h8, + // f7, g7, h7, f6, g6 and h6. + Bitboard kingZone[2]; + + // kingAttackersCount[color] is the number of pieces of the given color + // which attack a square in the kingZone of the enemy king. + int kingAttackersCount[2]; + + // kingAttackersWeight[color] is the sum of the "weight" of the pieces of the + // given color which attack a square in the kingZone of the enemy king. The + // weights of the individual piece types are given by the variables + // QueenAttackWeight, RookAttackWeight, BishopAttackWeight and + // KnightAttackWeight in evaluate.cpp + int kingAttackersWeight[2]; + + // kingAdjacentZoneAttacksCount[color] is the number of attacks to squares + // directly adjacent to the king of the given color. Pieces which attack + // more than one square are counted multiple times. For instance, if black's + // king is on g8 and there's a white knight on g5, this knight adds + // 2 to kingAdjacentZoneAttacksCount[BLACK]. + int kingAdjacentZoneAttacksCount[2]; + }; + const int Sign[2] = { 1, -1 }; // Evaluation grain size, must be a power of 2 @@ -61,8 +102,9 @@ namespace { S(248, 271), S(233, 201), S(252, 259), S(46, 0), S(247, 0), S(259, 0) }; - // Pieces mobility bonus in middle game and endgame, indexed by piece type - // and number of attacked squares not occupied by friendly pieces. + // MobilityBonus[PieceType][attacked] contains mobility bonuses for middle and + // end game, indexed by piece type and number of attacked squares not occupied + // by friendly pieces. const Score MobilityBonus[][32] = { {}, {}, { S(-38,-33), S(-25,-23), S(-12,-13), S( 0, -3), S(12, 7), S(25, 17), // Knights @@ -81,8 +123,8 @@ namespace { S( 20, 35), S( 20, 35) } }; - // Outpost bonuses for knights and bishops, indexed by square (from white's - // point of view). + // OutpostBonus[PieceType][Square] contains outpost bonuses of knights and + // bishops, indexed by piece type and square (from white's point of view). const Value OutpostBonus[][64] = { { // A B C D E F G H @@ -105,9 +147,9 @@ namespace { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) } }; - // ThreatBonus[attacking][attacked] contains bonus according to which - // piece type attacks which one. - const Score ThreatBonus[8][8] = { + // ThreatBonus[attacking][attacked] contains threat bonuses according to + // which piece type attacks which one. + const Score ThreatBonus[][8] = { {}, {}, { 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 @@ -115,9 +157,9 @@ namespace { { 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 - // type is attacked by an enemy pawn. - const Score ThreatedByPawnPenalty[8] = { + // ThreatedByPawnPenalty[PieceType] contains a penalty according to which + // piece type is attacked by an enemy pawn. + const Score ThreatedByPawnPenalty[] = { S(0, 0), S(0, 0), S(56, 70), S(56, 70), S(76, 99), S(86, 118) }; @@ -135,26 +177,26 @@ namespace { // right to castle. const Value TrappedRookPenalty = Value(180); - // The SpaceMask[color] contains the area of the board which is considered + // 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 // friendly minor pieces. const Bitboard SpaceMask[2] = { - (1ULL< - Value do_evaluate(const Position& pos, EvalInfo& ei); + Value do_evaluate(const Position& pos, Value margins[]); template void init_attack_tables(const Position& pos, EvalInfo& ei); template - void evaluate_pieces_of_color(const Position& pos, EvalInfo& ei); + Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei); template - void evaluate_king(const Position& pos, EvalInfo& ei); + void evaluate_king(const Position& pos, EvalInfo& ei, Value margins[]); template void evaluate_threats(const Position& pos, EvalInfo& ei); @@ -228,41 +271,45 @@ void prefetchPawn(Key key, int threadID) { /// evaluate() is the main evaluation function. It always computes two /// values, an endgame score and a middle game score, and interpolates /// between them based on the remaining material. -Value evaluate(const Position& pos, EvalInfo& ei) { +Value evaluate(const Position& pos, Value margins[]) { - return CpuHasPOPCNT ? do_evaluate(pos, ei) - : do_evaluate(pos, ei); + return CpuHasPOPCNT ? do_evaluate(pos, margins) + : do_evaluate(pos, margins); } namespace { template -Value do_evaluate(const Position& pos, EvalInfo& ei) { +Value do_evaluate(const Position& pos, Value margins[]) { + EvalInfo ei; ScaleFactor factor[2]; + Score mobility; assert(pos.is_ok()); assert(pos.thread() >= 0 && pos.thread() < MAX_THREADS); assert(!pos.is_check()); - memset(&ei, 0, sizeof(EvalInfo)); - // Initialize by reading the incrementally updated scores included in the - // position object (material + piece square tables) + // position object (material + piece square tables). ei.value = pos.value(); + // margins[color] stores the uncertainty estimation of position's evaluation + // and typically is used by the search for pruning decisions. + margins[WHITE] = margins[BLACK] = VALUE_ZERO; + // Probe the material hash table - ei.mi = MaterialTable[pos.thread()]->get_material_info(pos); - ei.value += ei.mi->material_value(); + MaterialInfo* mi = MaterialTable[pos.thread()]->get_material_info(pos); + ei.value += mi->material_value(); // If we have a specialized evaluation function for the current material - // configuration, call it and return - if (ei.mi->specialized_eval_exists()) - return ei.mi->evaluate(pos); + // configuration, call it and return. + if (mi->specialized_eval_exists()) + return mi->evaluate(pos); // After get_material_info() call that modifies them - factor[WHITE] = ei.mi->scale_factor(pos, WHITE); - factor[BLACK] = ei.mi->scale_factor(pos, BLACK); + factor[WHITE] = mi->scale_factor(pos, WHITE); + factor[BLACK] = mi->scale_factor(pos, BLACK); // Probe the pawn hash table ei.pi = PawnTable[pos.thread()]->get_pawn_info(pos); @@ -272,15 +319,16 @@ Value do_evaluate(const Position& pos, EvalInfo& ei) { init_attack_tables(pos, ei); init_attack_tables(pos, ei); - // Evaluate pieces - evaluate_pieces_of_color(pos, ei); - evaluate_pieces_of_color(pos, ei); + // Evaluate pieces and mobility + mobility = evaluate_pieces_of_color(pos, ei) + - evaluate_pieces_of_color(pos, ei); + ei.value += apply_weight(mobility, Weights[Mobility]); // Kings. Kings are evaluated after all other pieces for both sides, // because we need complete attack information for all pieces when computing // the king safety evaluation. - evaluate_king(pos, ei); - evaluate_king(pos, ei); + evaluate_king(pos, ei, margins); + evaluate_king(pos, ei, margins); // Evaluate tactical threats, we need full attack info including king evaluate_threats(pos, ei); @@ -290,7 +338,7 @@ Value do_evaluate(const Position& pos, EvalInfo& ei) { evaluate_passed_pawns(pos, ei); evaluate_passed_pawns(pos, ei); - Phase phase = ei.mi->game_phase(); + Phase phase = mi->game_phase(); // Middle-game specific evaluation terms if (phase > PHASE_ENDGAME) @@ -307,16 +355,13 @@ Value do_evaluate(const Position& pos, EvalInfo& ei) { ei.value += make_score(ei.pi->kingside_storm_value(WHITE) - ei.pi->queenside_storm_value(BLACK), 0); // Evaluate space for both sides - if (ei.mi->space_weight() > 0) + if (mi->space_weight() > 0) { int s = evaluate_space(pos, ei) - evaluate_space(pos, ei); - ei.value += apply_weight(make_score(s * ei.mi->space_weight(), 0), Weights[Space]); + ei.value += apply_weight(make_score(s * mi->space_weight(), 0), Weights[Space]); } } - // Mobility - ei.value += apply_weight(ei.mobility, Weights[Mobility]); - // If we don't already have an unusual scale factor, check for opposite // colored bishop endgames, and use a lower scale for those if ( phase < PHASE_MIDGAME @@ -429,8 +474,8 @@ namespace { ei.kingZone[Us] = (b | (Us == WHITE ? b >> 8 : b << 8)); ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us); b &= ei.attackedBy[Us][PAWN]; - if (b) - ei.kingAttackersCount[Us] = count_1s_max_15(b) / 2; + ei.kingAttackersCount[Us] = b ? count_1s_max_15(b) / 2 : 0; + ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0; } @@ -463,16 +508,19 @@ namespace { // evaluate_pieces<>() assigns bonuses and penalties to the pieces of a given color template - void evaluate_pieces(const Position& pos, EvalInfo& ei, Bitboard no_mob_area) { + Score evaluate_pieces(const Position& pos, EvalInfo& ei, Bitboard no_mob_area) { Bitboard b; Square s, ksq; int mob; File f; + Score mobility = SCORE_ZERO; const Color Them = (Us == WHITE ? BLACK : WHITE); const Square* ptr = pos.piece_list_begin(Us, Piece); + ei.attackedBy[Us][Piece] = 0; + while ((s = *ptr++) != SQ_NONE) { // Find attacked squares, including x-ray attacks for bishops and rooks @@ -502,7 +550,7 @@ namespace { mob = (Piece != QUEEN ? count_1s_max_15(b & no_mob_area) : count_1s(b & no_mob_area)); - ei.mobility += Sign[Us] * MobilityBonus[Piece][mob]; + mobility += MobilityBonus[Piece][mob]; // 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. @@ -561,6 +609,7 @@ namespace { } } } + return mobility; } @@ -601,29 +650,32 @@ namespace { // pieces of a given color. template - void evaluate_pieces_of_color(const Position& pos, EvalInfo& ei) { + Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE); + Score mobility = SCORE_ZERO; + // Do not include in mobility squares protected by enemy pawns or occupied by our pieces const Bitboard no_mob_area = ~(ei.attackedBy[Them][PAWN] | pos.pieces_of_color(Us)); - evaluate_pieces(pos, ei, no_mob_area); - evaluate_pieces(pos, ei, no_mob_area); - evaluate_pieces(pos, ei, no_mob_area); - evaluate_pieces(pos, ei, no_mob_area); + mobility += evaluate_pieces(pos, ei, no_mob_area); + mobility += evaluate_pieces(pos, ei, no_mob_area); + mobility += evaluate_pieces(pos, ei, no_mob_area); + mobility += evaluate_pieces(pos, ei, no_mob_area); // Sum up all attacked squares ei.attackedBy[Us][0] = ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT] | ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK] | ei.attackedBy[Us][QUEEN] | ei.attackedBy[Us][KING]; + return mobility; } // evaluate_king<>() assigns bonuses and penalties to a king of a given color template - void evaluate_king(const Position& pos, EvalInfo& ei) { + void evaluate_king(const Position& pos, EvalInfo& ei, Value margins[]) { const Color Them = (Us == WHITE ? BLACK : WHITE); @@ -647,10 +699,10 @@ namespace { // Find the attacked squares around the king which has no defenders // apart from the king itself - undefended = ei.attacked_by(Them) & ei.attacked_by(Us, KING); - undefended &= ~( ei.attacked_by(Us, PAWN) | ei.attacked_by(Us, KNIGHT) - | ei.attacked_by(Us, BISHOP) | ei.attacked_by(Us, ROOK) - | ei.attacked_by(Us, QUEEN)); + undefended = ei.attackedBy[Them][0] & ei.attackedBy[Us][KING]; + undefended &= ~( ei.attackedBy[Us][PAWN] | ei.attackedBy[Us][KNIGHT] + | ei.attackedBy[Us][BISHOP] | ei.attackedBy[Us][ROOK] + | ei.attackedBy[Us][QUEEN]); // Initialize the 'attackUnits' variable, which is used later on as an // index to the KingDangerTable[] array. The initial value is based on @@ -664,39 +716,39 @@ namespace { // 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); + b = undefended & ei.attackedBy[Them][QUEEN] & ~pos.pieces_of_color(Them); if (b) { // ...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)); + b &= ( ei.attackedBy[Them][PAWN] | ei.attackedBy[Them][KNIGHT] + | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][ROOK]); if (b) attackUnits += QueenContactCheckBonus * count_1s_max_15(b) * (sente ? 2 : 1); } // Analyse enemy's safe distance checks for sliders and knights - safe = ~(pos.pieces_of_color(Them) | ei.attacked_by(Us)); + safe = ~(pos.pieces_of_color(Them) | ei.attackedBy[Us][0]); b1 = pos.attacks_from(ksq) & safe; b2 = pos.attacks_from(ksq) & safe; // Enemy queen safe checks - b = (b1 | b2) & ei.attacked_by(Them, QUEEN); + b = (b1 | b2) & ei.attackedBy[Them][QUEEN]; if (b) attackUnits += QueenCheckBonus * count_1s_max_15(b); // Enemy rooks safe checks - b = b1 & ei.attacked_by(Them, ROOK); + b = b1 & ei.attackedBy[Them][ROOK]; if (b) attackUnits += RookCheckBonus * count_1s_max_15(b); // Enemy bishops safe checks - b = b2 & ei.attacked_by(Them, BISHOP); + b = b2 & ei.attackedBy[Them][BISHOP]; if (b) attackUnits += BishopCheckBonus * count_1s_max_15(b); // Enemy knights safe checks - b = pos.attacks_from(ksq) & ei.attacked_by(Them, KNIGHT) & safe; + b = pos.attacks_from(ksq) & ei.attackedBy[Them][KNIGHT] & safe; if (b) attackUnits += KnightCheckBonus * count_1s_max_15(b); @@ -704,12 +756,12 @@ namespace { attackUnits = Min(99, Max(0, attackUnits)); // Finally, extract the king danger score from the KingDangerTable[] - // array and subtract the score from evaluation. Set also ei.kingDanger[] + // array and subtract the score from evaluation. Set also ei.margin[] // value that will be used for pruning because this value can sometimes // 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. ei.value -= Sign[Us] * KingDangerTable[Us][attackUnits]; - ei.kingDanger[Us] = mg_value(KingDangerTable[Us][attackUnits]); + margins[Us] += mg_value(KingDangerTable[Us][attackUnits]); } } @@ -721,11 +773,14 @@ namespace { const Color Them = (Us == WHITE ? BLACK : WHITE); + Score bonus = SCORE_ZERO; Bitboard squaresToQueen, defendedSquares, unsafeSquares, supportingPawns; Bitboard b = ei.pi->passed_pawns(Us); - while (b) - { + if (!b) + return; + + do { Square s = pop_1st_bit(&b); assert(pos.pawn_is_passed(Us, s)); @@ -750,7 +805,7 @@ namespace { if (pos.square_is_empty(blockSq)) { squaresToQueen = squares_in_front_of(Us, s); - defendedSquares = squaresToQueen & ei.attacked_by(Us); + defendedSquares = squaresToQueen & ei.attackedBy[Us][0]; // If there is an enemy rook or queen attacking the pawn from behind, // add all X-ray attacks by the rook or queen. Otherwise consider only @@ -759,7 +814,7 @@ namespace { && (squares_behind(Us, s) & pos.pieces(ROOK, QUEEN, Them) & pos.attacks_from(s))) unsafeSquares = squaresToQueen; else - unsafeSquares = squaresToQueen & (ei.attacked_by(Them) | pos.pieces_of_color(Them)); + unsafeSquares = squaresToQueen & (ei.attackedBy[Them][0] | pos.pieces_of_color(Them)); // 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. @@ -800,11 +855,12 @@ namespace { else if (pos.pieces(ROOK, QUEEN, Them)) ebonus -= ebonus / 4; } + bonus += make_score(mbonus, ebonus); - // Add the scores for this pawn to the middle game and endgame eval - ei.value += Sign[Us] * apply_weight(make_score(mbonus, ebonus), Weights[PassedPawns]); + } while (b); - } // while + // Add the scores to the middle game and endgame eval + ei.value += Sign[Us] * apply_weight(bonus, Weights[PassedPawns]); } @@ -824,8 +880,8 @@ namespace { // pawn, or if it is undefended and attacked by an enemy piece. Bitboard safe = SpaceMask[Us] & ~pos.pieces(PAWN, Us) - & ~ei.attacked_by(Them, PAWN) - & (ei.attacked_by(Us) | ~ei.attacked_by(Them)); + & ~ei.attackedBy[Them][PAWN] + & (ei.attackedBy[Us][0] | ~ei.attackedBy[Them][0]); // Find all squares which are at most three squares behind some friendly pawn Bitboard behind = pos.pieces(PAWN, Us);