X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=e84cf44ecba19151c58e9c8e71a041928e5a561c;hp=6ef8e18337e3507d6ee155b8e49970a2ae03a4b9;hb=4626ec2890b140829e9971658ca948005b945fd4;hpb=73da3a431c6d2c9e3391a796c1bebf9967e27a25 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 6ef8e183..e84cf44e 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -241,6 +241,40 @@ namespace { // Bonus for having a mate threat, initialized from UCI options int MateThreatBonus; + // ThreatBonus[][] contains bonus according to which piece type + // attacks which one. + const Value MidgameThreatBonus[8][8] = { + { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) }, // not used + { V(0),V(18), V(0),V(37), V(55), V(55), V(0), V(0) }, // KNIGHT attacks + { V(0),V(18),V(37), V(0), V(55), V(55), V(0), V(0) }, // BISHOP attacks + { V(0), V(9),V(27),V(27), V(0), V(37), V(0), V(0) }, // ROOK attacks + { V(0),V(27),V(27),V(27), V(27), V(0), V(0), V(0) }, // QUEEN attacks + { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) }, // not used + { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) }, // not used + { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) } // not used + }; + + const Value EndgameThreatBonus[8][8] = { + { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) }, // not used + { V(0),V(37), V(0),V(47), V(97), V(97), V(0), V(0) }, // KNIGHT attacks + { V(0),V(37),V(47), V(0), V(97), V(97), V(0), V(0) }, // BISHOP attacks + { V(0),V(27),V(47),V(47), V(0), V(47), V(0), V(0) }, // ROOK attacks + { V(0),V(37),V(37),V(37), V(37), V(0), V(0), V(0) }, // QUEEN attacks + { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) }, // not used + { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) }, // not used + { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) } // not used + }; + + // ThreatedByPawnPenalty[] contains a penalty according to which piece + // type is attacked by an enemy pawn. + const Value MidgameThreatedByPawnPenalty[8] = { + V(0), V(0), V(56), V(56), V(76), V(86), V(0), V(0) + }; + + const Value EndgameThreatedByPawnPenalty[8] = { + V(0), V(0), V(70), V(70), V(99), V(118), V(0), V(0) + }; + // InitKingDanger[] contains bonuses based on the position of the defending // king. const int InitKingDanger[64] = { @@ -276,6 +310,9 @@ namespace { template void evaluate_king(const Position& pos, EvalInfo& ei); + template + void evaluate_threats(const Position& pos, EvalInfo& ei); + template void evaluate_space(const Position& pos, EvalInfo& ei); @@ -283,7 +320,8 @@ namespace { void evaluate_trapped_bishop_a7h7(const Position& pos, Square s, Color us, EvalInfo& ei); void evaluate_trapped_bishop_a1h1(const Position& pos, Square s, Color us, EvalInfo& ei); inline Value apply_weight(Value v, int w); - Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]); + inline Score apply_weight(Score v, int wmg, int weg); + Value scale_by_game_phase(const Score& v, Phase ph, const ScaleFactor sf[]); int weight_option(const std::string& opt, int weight); void init_safety(); } @@ -315,13 +353,11 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { // Initialize by reading the incrementally updated scores included in the // position object (material + piece square tables) - ei.mgValue = pos.mg_value(); - ei.egValue = pos.eg_value(); + ei.value = pos.value(); // Probe the material hash table ei.mi = MaterialTable[threadID]->get_material_info(pos); - ei.mgValue += ei.mi->material_value(); - ei.egValue += ei.mi->material_value(); + ei.value += ei.mi->material_value(); // If we have a specialized evaluation function for the current material // configuration, call it and return @@ -335,8 +371,7 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { // Probe the pawn hash table ei.pi = PawnTable[threadID]->get_pawn_info(pos); - ei.mgValue += apply_weight(ei.pi->mg_value(), WeightPawnStructureMidgame); - ei.egValue += apply_weight(ei.pi->eg_value(), WeightPawnStructureEndgame); + ei.value += apply_weight(ei.pi->value(), WeightPawnStructureMidgame, WeightPawnStructureEndgame); // Initialize king attack bitboards and king attack zones for both sides ei.attackedBy[WHITE][KING] = pos.attacks_from(pos.king_square(WHITE)); @@ -365,6 +400,10 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { evaluate_king(pos, ei); evaluate_king(pos, ei); + // Evaluate tactical threats, we need full attack info + evaluate_threats(pos, ei); + evaluate_threats(pos, ei); + // Evaluate passed pawns. We evaluate passed pawns for both sides at once, // because we need to know which side promotes first in positions where // both sides have an unstoppable passed pawn. To be called after all attacks @@ -381,14 +420,12 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { if ( square_file(pos.king_square(WHITE)) >= FILE_E && square_file(pos.king_square(BLACK)) <= FILE_D) - ei.mgValue += ei.pi->queenside_storm_value(WHITE) - - ei.pi->kingside_storm_value(BLACK); + ei.value += Score(ei.pi->queenside_storm_value(WHITE) - ei.pi->kingside_storm_value(BLACK), 0); else if ( square_file(pos.king_square(WHITE)) <= FILE_D && square_file(pos.king_square(BLACK)) >= FILE_E) - ei.mgValue += ei.pi->kingside_storm_value(WHITE) - - ei.pi->queenside_storm_value(BLACK); + ei.value += 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) @@ -399,15 +436,14 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { } // Mobility - ei.mgValue += apply_weight(ei.mgMobility, WeightMobilityMidgame); - ei.egValue += apply_weight(ei.egMobility, WeightMobilityEndgame); + ei.value += apply_weight(Score(ei.mgMobility, ei.egMobility), WeightMobilityMidgame, WeightMobilityEndgame); // 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 && pos.opposite_colored_bishops() - && ( (factor[WHITE] == SCALE_FACTOR_NORMAL && ei.egValue > Value(0)) - || (factor[BLACK] == SCALE_FACTOR_NORMAL && ei.egValue < Value(0)))) + && ( (factor[WHITE] == SCALE_FACTOR_NORMAL && ei.value.eg() > Value(0)) + || (factor[BLACK] == SCALE_FACTOR_NORMAL && ei.value.eg() < Value(0)))) { ScaleFactor sf; @@ -434,7 +470,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.mgValue, ei.egValue, phase, factor); + Value v = Sign[stm] * scale_by_game_phase(ei.value, phase, factor); return (ei.mateThreat[stm] == MOVE_NONE ? v : 8 * QueenValueMidgame - v); } @@ -452,12 +488,10 @@ Value quick_evaluate(const Position &pos) { static const ScaleFactor sf[2] = {SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL}; - Value mgv = pos.mg_value(); - Value egv = pos.eg_value(); Phase ph = pos.game_phase(); Color stm = pos.side_to_move(); - return Sign[stm] * scale_by_game_phase(mgv, egv, ph, sf); + return Sign[stm] * scale_by_game_phase(pos.value(), ph, sf); } @@ -531,13 +565,12 @@ namespace { // evaluate_mobility() computes mobility and attacks for every piece template - int evaluate_mobility(const Position& pos, Bitboard b, Bitboard mob_area, EvalInfo& ei) { + int evaluate_mobility(Bitboard b, Bitboard mob_area, EvalInfo& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE); static const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight }; static const Value* MgBonus[] = { 0, 0, MidgameKnightMobilityBonus, MidgameBishopMobilityBonus, MidgameRookMobilityBonus, MidgameQueenMobilityBonus }; static const Value* EgBonus[] = { 0, 0, EndgameKnightMobilityBonus, EndgameBishopMobilityBonus, EndgameRookMobilityBonus, EndgameQueenMobilityBonus }; - static const int lastIndex[] = { 0, 0, 8, 15, 15, 31 }; // Update attack info ei.attackedBy[Us][Piece] |= b; @@ -552,20 +585,9 @@ namespace { ei.kingAdjacentZoneAttacksCount[Us] += count_1s_max_15(bb); } - // The squares occupied by enemy pieces (not defended by pawns) will be - // counted two times instead of one. The shift (almost) guarantees that - // intersection of the shifted value with b is zero so that after or-ing - // the count of 1s bits is increased by the number of affected squares. - b &= mob_area; - b |= Us == WHITE ? ((b & pos.pieces_of_color(Them)) >> 1) - : ((b & pos.pieces_of_color(Them)) << 1); - // Mobility - int mob = (Piece != QUEEN ? count_1s_max_15(b) - : count_1s(b)); - - if (mob > lastIndex[Piece]) - mob = lastIndex[Piece]; + int mob = (Piece != QUEEN ? count_1s_max_15(b & mob_area) + : count_1s(b & mob_area)); ei.mgMobility += Sign[Us] * MgBonus[Piece][mob]; ei.egMobility += Sign[Us] * EgBonus[Piece][mob]; @@ -594,8 +616,7 @@ namespace { else bonus += bonus / 2; } - ei.mgValue += Sign[Us] * bonus; - ei.egValue += Sign[Us] * bonus; + ei.value += Sign[Us] * Score(bonus, bonus); } @@ -627,7 +648,12 @@ namespace { assert(false); // Attacks and mobility - mob = evaluate_mobility(pos, b, mob_area, ei); + mob = evaluate_mobility(b, mob_area, ei); + + // 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. + if (bit_is_set(ei.attackedBy[Them][PAWN], s)) + ei.value -= Sign[Us] * Score(MidgameThreatedByPawnPenalty[Piece], EndgameThreatedByPawnPenalty[Piece]); // Bishop and knight outposts squares if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, Them)) @@ -650,8 +676,8 @@ namespace { if ( relative_rank(Us, s) == RANK_7 && relative_rank(Us, pos.king_square(Them)) == RANK_8) { - ei.mgValue += Sign[Us] * (Piece == ROOK ? MidgameRookOn7thBonus : MidgameQueenOn7thBonus); - ei.egValue += Sign[Us] * (Piece == ROOK ? EndgameRookOn7thBonus : EndgameQueenOn7thBonus); + ei.value += Sign[Us] * (Piece == ROOK ? Score(MidgameRookOn7thBonus, EndgameRookOn7thBonus) + : Score(MidgameQueenOn7thBonus, EndgameQueenOn7thBonus)); } } @@ -663,15 +689,9 @@ namespace { if (ei.pi->file_is_half_open(Us, f)) { if (ei.pi->file_is_half_open(Them, f)) - { - ei.mgValue += Sign[Us] * RookOpenFileBonus; - ei.egValue += Sign[Us] * RookOpenFileBonus; - } + ei.value += Sign[Us] * Score(RookOpenFileBonus, RookOpenFileBonus); else - { - ei.mgValue += Sign[Us] * RookHalfOpenFileBonus; - ei.egValue += Sign[Us] * RookHalfOpenFileBonus; - } + ei.value += Sign[Us] * Score(RookHalfOpenFileBonus, RookHalfOpenFileBonus); } // Penalize rooks which are trapped inside a king. Penalize more if @@ -687,8 +707,8 @@ namespace { { // Is there a half-open file between the king and the edge of the board? if (!ei.pi->has_open_file_to_right(Us, square_file(ksq))) - ei.mgValue -= pos.can_castle(Us)? Sign[Us] * ((TrappedRookPenalty - mob * 16) / 2) - : Sign[Us] * (TrappedRookPenalty - mob * 16); + ei.value -= Sign[Us] * Score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2 + : (TrappedRookPenalty - mob * 16), 0); } else if ( square_file(ksq) <= FILE_D && square_file(s) < square_file(ksq) @@ -696,14 +716,47 @@ namespace { { // Is there a half-open file between the king and the edge of the board? if (!ei.pi->has_open_file_to_left(Us, square_file(ksq))) - ei.mgValue -= pos.can_castle(Us)? Sign[Us] * ((TrappedRookPenalty - mob * 16) / 2) - : Sign[Us] * (TrappedRookPenalty - mob * 16); + ei.value -= Sign[Us] * Score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2 + : (TrappedRookPenalty - mob * 16), 0); } } } } + // evaluate_threats<>() assigns bonuses according to the type of attacking piece + // and the type of attacked one. + + template + void evaluate_threats(const Position& pos, EvalInfo& ei) { + + const Color Them = (Us == WHITE ? BLACK : WHITE); + + Bitboard b; + Score bonus(0, 0); + + // Enemy pieces not defended by a pawn and under our attack + Bitboard weakEnemies = pos.pieces_of_color(Them) + & ~ei.attackedBy[Them][PAWN] + & ei.attackedBy[Us][0]; + if (!weakEnemies) + return; + + // Add bonus according to type of attacked enemy pieces and to the + // type of attacking piece, from knights to queens. Kings are not + // considered because are already special handled in king evaluation. + for (PieceType pt1 = KNIGHT; pt1 < KING; pt1++) + { + b = ei.attackedBy[Us][pt1] & weakEnemies; + if (b) + for (PieceType pt2 = PAWN; pt2 < KING; pt2++) + if (b & pos.pieces(pt2)) + bonus += Score(MidgameThreatBonus[pt1][pt2], EndgameThreatBonus[pt1][pt2]); + } + ei.value += Sign[Us] * bonus; + } + + // evaluate_pieces_of_color<>() assigns bonuses and penalties to all the // pieces of a given color. @@ -735,7 +788,7 @@ namespace { if (relative_rank(Us, s) <= RANK_4) { shelter = ei.pi->get_king_shelter(pos, Us, s); - ei.mgValue += Sign[Us] * Value(shelter); + ei.value += Sign[Us] * Score(shelter, 0); } // King safety. This is quite complicated, and is almost certainly far @@ -884,7 +937,7 @@ namespace { // change far bigger than the value of the captured piece. Value v = apply_weight(SafetyTable[attackUnits], WeightKingSafety[Us]); - ei.mgValue -= Sign[Us] * v; + ei.value -= Sign[Us] * Score(v, 0); if (Us == pos.side_to_move()) ei.futilityMargin += v; @@ -1015,8 +1068,8 @@ namespace { } // Add the scores for this pawn to the middle game and endgame eval. - ei.mgValue += apply_weight(Sign[Us] * mbonus, WeightPassedPawnsMidgame); - ei.egValue += apply_weight(Sign[Us] * ebonus, WeightPassedPawnsEndgame); + ei.value += Score(apply_weight(Sign[Us] * mbonus, WeightPassedPawnsMidgame), + apply_weight(Sign[Us] * ebonus, WeightPassedPawnsEndgame)); } // while } @@ -1041,7 +1094,7 @@ namespace { if (!movesToGo[WHITE] || !movesToGo[BLACK]) { Color winnerSide = movesToGo[WHITE] ? WHITE : BLACK; - ei.egValue += Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * movesToGo[winnerSide])); + ei.value += Score(0, Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * movesToGo[winnerSide]))); } else { // Both sides have unstoppable pawns! Try to find out who queens @@ -1056,7 +1109,7 @@ namespace { // If one side queens at least three plies before the other, that side wins if (movesToGo[winnerSide] <= movesToGo[loserSide] - 3) - ei.egValue += Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2))); + ei.value += Score(0, Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2)))); // If one side queens one ply before the other and checks the king or attacks // the undefended opponent's queening square, that side wins. To avoid cases @@ -1077,7 +1130,7 @@ namespace { if ( (b & pos.pieces(KING, loserSide)) ||(bit_is_set(b, loserQSq) && !bit_is_set(ei.attacked_by(loserSide), loserQSq))) - ei.egValue += Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2))); + ei.value += Score(0, Sign[winnerSide] * (UnstoppablePawnValue - Value(0x40 * (movesToGo[winnerSide]/2)))); } } } @@ -1099,8 +1152,7 @@ namespace { && pos.see(s, b6) < 0 && pos.see(s, b8) < 0) { - ei.mgValue -= Sign[us] * TrappedBishopA7H7Penalty; - ei.egValue -= Sign[us] * TrappedBishopA7H7Penalty; + ei.value -= Sign[us] * Score(TrappedBishopA7H7Penalty, TrappedBishopA7H7Penalty); } } @@ -1143,8 +1195,7 @@ namespace { else penalty = TrappedBishopA1H1Penalty / 2; - ei.mgValue -= Sign[us] * penalty; - ei.egValue -= Sign[us] * penalty; + ei.value -= Sign[us] * Score(penalty, penalty); } } @@ -1178,7 +1229,7 @@ namespace { int space = count_1s_max_15(safeSquares) + count_1s_max_15(behindFriendlyPawns & safeSquares); - ei.mgValue += Sign[Us] * apply_weight(Value(space * ei.mi->space_weight()), WeightSpace); + ei.value += Sign[Us] * Score(apply_weight(Value(space * ei.mi->space_weight()), WeightSpace), 0); } @@ -1188,20 +1239,24 @@ namespace { return (v*w) / 0x100; } + inline Score apply_weight(Score v, int wmg, int weg) { + return Score(v.mg()*wmg, v.eg()*weg) / 0x100; + } + // scale_by_game_phase() interpolates between a middle game and an endgame // score, based on game phase. It also scales the return value by a // ScaleFactor array. - Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]) { + Value scale_by_game_phase(const Score& v, Phase ph, const ScaleFactor sf[]) { - assert(mv > -VALUE_INFINITE && mv < VALUE_INFINITE); - assert(ev > -VALUE_INFINITE && ev < VALUE_INFINITE); + assert(v.mg() > -VALUE_INFINITE && v.mg() < VALUE_INFINITE); + assert(v.eg() > -VALUE_INFINITE && v.eg() < VALUE_INFINITE); assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME); - ev = apply_scale_factor(ev, sf[(ev > Value(0) ? WHITE : BLACK)]); + Value ev = apply_scale_factor(v.eg(), sf[(v.eg() > Value(0) ? WHITE : BLACK)]); - Value result = Value(int((mv * ph + ev * (128 - ph)) / 128)); + Value result = Value(int((v.mg() * ph + ev * (128 - ph)) / 128)); return Value(int(result) & ~(GrainSize - 1)); } @@ -1258,3 +1313,8 @@ namespace { } } } + +std::ostream& operator<<(std::ostream &os, Score s) { + + return os << "(" << s.mg() << ", " << s.eg() << ")"; +}