X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=f93afad505883031820e8e9f46e4d3979959b980;hp=1d4be67b2d0e7c3d4c5405c64ea6ebda36444aa2;hb=bbd3e30b4e297877f1e1cad3e5b942175c58290b;hpb=c729e4e1aba0d0d1cded8bf1dc1eb6c7e56938dd diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 1d4be67b..f93afad5 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -170,13 +170,13 @@ namespace { // Bonus for unstoppable passed pawns const Value UnstoppablePawnValue = Value(0x500); - // Rooks and queens on the 7th rank + // Rooks and queens on the 7th rank (modified by Joona Kiiski) const Value MidgameRookOn7thBonus = Value(47); const Value EndgameRookOn7thBonus = Value(98); const Value MidgameQueenOn7thBonus = Value(27); const Value EndgameQueenOn7thBonus = Value(54); - // Rooks on open files + // Rooks on open files (modified by Joona Kiiski) const Value RookOpenFileBonus = Value(43); const Value RookHalfOpenFileBonus = Value(19); @@ -274,8 +274,8 @@ namespace { template void evaluate_pieces(const Position& p, Color us, EvalInfo& ei); - template<> - void evaluate_pieces(const Position& p, Color us, EvalInfo &ei); + template + void evaluate_king(const Position& p, Color us, EvalInfo &ei); void evaluate_passed_pawns(const Position &pos, EvalInfo &ei); void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us, @@ -368,11 +368,11 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { | ei.attackedBy[c][QUEEN] | ei.attackedBy[c][KING]; } - // Kings. Kings are evaluated after all other pieces for both sides, + // 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. for (Color c = WHITE; c <= BLACK; c++) - evaluate_pieces(pos, c, ei); + evaluate_king(pos, c, 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 @@ -494,8 +494,8 @@ void init_eval(int threads) { for (Bitboard b = 0ULL; b < 256ULL; b++) { - assert(count_1s(b) == int(uint8_t(count_1s(b)))); - BitCount8Bit[b] = (uint8_t)count_1s(b); + assert(count_1s(b) == int(uint8_t(count_1s(b)))); + BitCount8Bit[b] = (uint8_t)count_1s(b); } } @@ -538,22 +538,19 @@ void read_weights(Color us) { namespace { - // evaluate_common() computes terms common to all pieces attack + // evaluate_mobility() computes mobility and attacks for every piece template - int evaluate_common(const Position& p, const Bitboard& b, Color us, EvalInfo& ei, Square s = SQ_NONE) { + int evaluate_mobility(const Position& p, const Bitboard& b, Color us, Color them, EvalInfo& ei) { 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 Value* OutpostBonus[] = { 0, 0, KnightOutpostBonus, BishopOutpostBonus, 0, 0 }; - - Color them = opposite_color(us); // Update attack info ei.attackedBy[us][Piece] |= b; - // King attack + // King attacks if (b & ei.kingZone[us]) { ei.kingAttackersCount[us]++; @@ -572,28 +569,31 @@ namespace { ei.mgMobility += Sign[us] * MgBonus[Piece][mob]; ei.egMobility += Sign[us] * EgBonus[Piece][mob]; + return mob; + } - // Bishop and Knight outposts - if ( (Piece == BISHOP || Piece == KNIGHT) // compile time condition - && p.square_is_weak(s, them)) - { - // Initial bonus based on square - Value v, bonus; - v = bonus = OutpostBonus[Piece][relative_square(us, s)]; - // Increase bonus if supported by pawn, especially if the opponent has - // no minor piece which can exchange the outpost piece - if (v && (p.pawn_attacks(them, s) & p.pawns(us))) - { - bonus += v / 2; - if ( p.piece_count(them, KNIGHT) == 0 - && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB) - bonus += v; - } - ei.mgValue += Sign[us] * bonus; - ei.egValue += Sign[us] * bonus; + // evaluate_outposts() evaluates bishop and knight outposts squares + + template + void evaluate_outposts(const Position& p, Color us, Color them, EvalInfo& ei, Square s) { + + // Initial bonus based on square + Value bonus = (Piece == BISHOP ? BishopOutpostBonus[relative_square(us, s)] + : KnightOutpostBonus[relative_square(us, s)]); + + // Increase bonus if supported by pawn, especially if the opponent has + // no minor piece which can exchange the outpost piece + if (bonus && (p.pawn_attacks(them, s) & p.pawns(us))) + { + if ( p.knights(them) == EmptyBoardBB + && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB) + bonus += bonus + bonus / 2; + else + bonus += bonus / 2; } - return mob; + ei.mgValue += Sign[us] * bonus; + ei.egValue += Sign[us] * bonus; } @@ -605,9 +605,9 @@ namespace { Bitboard b; Square s, ksq; - Color them; int mob; File f; + Color them = opposite_color(us); for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++) { @@ -619,9 +619,15 @@ namespace { b = bishop_attacks_bb(s, pos.occupied_squares() & ~pos.queens(us)); else if (Piece == ROOK) b = rook_attacks_bb(s, pos.occupied_squares() & ~pos.rooks_and_queens(us)); + else + assert(false); - // Attacks, mobility and outposts - mob = evaluate_common(pos, b, us, ei, s); + // Attacks and mobility + mob = evaluate_mobility(pos, b, us, them, ei); + + // Bishop and knight outposts squares + if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, them)) + evaluate_outposts(pos, us, them, ei, s); // Special patterns: trapped bishops on a7/h7/a2/h2 // and trapped bishops on a1/h1/a8/h8 in Chess960. @@ -637,8 +643,6 @@ namespace { if (Piece == ROOK || Piece == QUEEN) { // Queen or rook on 7th rank - them = opposite_color(us); - if ( relative_rank(us, s) == RANK_7 && relative_rank(us, pos.king_square(them)) == RANK_8) { @@ -700,11 +704,10 @@ namespace { return b >> (num << 3); } - // evaluate_pieces() assigns bonuses and penalties to a king of a given - // color. + // evaluate_king<>() assigns bonuses and penalties to a king of a given color. - template<> - void evaluate_pieces(const Position& p, Color us, EvalInfo& ei) { + template + void evaluate_king(const Position& p, Color us, EvalInfo& ei) { int shelter = 0, sign = Sign[us]; Square s = p.king_square(us); @@ -728,7 +731,7 @@ namespace { ei.mgValue += sign * Value(shelter); } - // King safety. This is quite complicated, and is almost certainly far + // King safety. This is quite complicated, and is almost certainly far // from optimally tuned. Color them = opposite_color(us); @@ -757,7 +760,7 @@ namespace { // quality of the pawn shelter. int attackUnits = Min((ei.kingAttackersCount[them] * ei.kingAttackersWeight[them]) / 2, 25) - + (ei.kingAdjacentZoneAttacksCount[them] + count_1s_max_15(undefended)) * 3 + + (ei.kingAdjacentZoneAttacksCount[them] + count_1s_max_15(undefended)) * 3 + InitKingDanger[relative_square(us, s)] - (shelter >> 5); // Analyse safe queen contact checks @@ -773,7 +776,7 @@ namespace { { // The bitboard b now contains the squares available for safe queen // contact checks. - int count = count_1s_max_15(b); + int count = count_1s_max_15(b); attackUnits += QueenContactCheckBonus * count * (sente ? 2 : 1); // Is there a mate threat? @@ -813,12 +816,12 @@ namespace { // Queen checks b2 = b & ei.attacked_by(them, QUEEN); if( b2) - attackUnits += QueenCheckBonus * count_1s_max_15(b2); + attackUnits += QueenCheckBonus * count_1s_max_15(b2); // Rook checks b2 = b & ei.attacked_by(them, ROOK); if (b2) - attackUnits += RookCheckBonus * count_1s_max_15(b2); + attackUnits += RookCheckBonus * count_1s_max_15(b2); } if (QueenCheckBonus > 0 || BishopCheckBonus > 0) { @@ -827,12 +830,12 @@ namespace { // Queen checks b2 = b & ei.attacked_by(them, QUEEN); if (b2) - attackUnits += QueenCheckBonus * count_1s_max_15(b2); + attackUnits += QueenCheckBonus * count_1s_max_15(b2); // Bishop checks b2 = b & ei.attacked_by(them, BISHOP); if (b2) - attackUnits += BishopCheckBonus * count_1s_max_15(b2); + attackUnits += BishopCheckBonus * count_1s_max_15(b2); } if (KnightCheckBonus > 0) { @@ -841,7 +844,7 @@ namespace { // Knight checks b2 = b & ei.attacked_by(them, KNIGHT); if (b2) - attackUnits += KnightCheckBonus * count_1s_max_15(b2); + attackUnits += KnightCheckBonus * count_1s_max_15(b2); } // Analyse discovered checks (only for non-pawns right now, consider @@ -850,7 +853,7 @@ namespace { { b = p.discovered_check_candidates(them) & ~p.pawns(); if (b) - attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente? 2 : 1); + attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente? 2 : 1); } // Has a mate threat been found? We don't do anything here if the @@ -933,29 +936,23 @@ namespace { && (squares_behind(us, s) & pos.rooks_and_queens(them))) b3 = b2; - if ((b2 & pos.pieces_of_color(them)) == EmptyBoardBB) - { - // There are no enemy pieces in the pawn's path! Are any of the - // squares in the pawn's path attacked by the enemy? - if (b3 == EmptyBoardBB) - // No enemy attacks, huge bonus! - ebonus += Value(tr * (b2 == b4 ? 17 : 15)); - else - // OK, there are enemy attacks. 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)); - } + // Squares attacked or occupied by enemy pieces + b3 |= (b2 & pos.pieces_of_color(them)); + + // There are no enemy pawns in the pawn's path + assert((b2 & pos.pieces_of_color_and_type(them, PAWN)) == EmptyBoardBB); + + // 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! + ebonus += Value(tr * (b2 == b4 ? 17 : 15)); else - { - // There are some enemy pieces in the pawn's path. While this is - // sad, we still assign a moderate bonus if all squares in the path - // which are either occupied by or attacked by enemy pieces are - // also attacked by us. - if (((b3 | (b2 & pos.pieces_of_color(them))) & ~b4) == EmptyBoardBB) - ebonus += Value(tr * 6); - } + // 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)); + // 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) @@ -985,7 +982,7 @@ namespace { if (d < 0) { int mtg = RANK_8 - relative_rank(us, s); - int blockerCount = count_1s_max_15(squares_in_front_of(us,s) & pos.occupied_squares()); + int blockerCount = count_1s_max_15(squares_in_front_of(us,s) & pos.occupied_squares()); mtg += blockerCount; d += blockerCount; if (d < 0) @@ -995,7 +992,7 @@ namespace { } } } - // Rook pawns are a special case: They are sometimes worse, and + // Rook pawns are a special case: They are sometimes worse, and // sometimes better than other passed pawns. It is difficult to find // good rules for determining whether they are good or bad. For now, // we try the following: Increase the value for rook pawns if the @@ -1003,10 +1000,10 @@ namespace { // value if the other side has a rook or queen. if (square_file(s) == FILE_A || square_file(s) == FILE_H) { - if( pos.non_pawn_material(them) <= KnightValueMidgame - && pos.piece_count(them, KNIGHT) <= 1) + if ( pos.non_pawn_material(them) <= KnightValueMidgame + && pos.piece_count(them, KNIGHT) <= 1) ebonus += ebonus / 4; - else if(pos.rooks_and_queens(them)) + else if (pos.rooks_and_queens(them)) ebonus -= ebonus / 4; } @@ -1018,9 +1015,9 @@ namespace { // Does either side have an unstoppable passed pawn? if (hasUnstoppable[WHITE] && !hasUnstoppable[BLACK]) - ei.egValue += UnstoppablePawnValue - Value(0x40 * movesToGo[WHITE]); + ei.egValue += UnstoppablePawnValue - Value(0x40 * movesToGo[WHITE]); else if (hasUnstoppable[BLACK] && !hasUnstoppable[WHITE]) - ei.egValue -= UnstoppablePawnValue - Value(0x40 * movesToGo[BLACK]); + ei.egValue -= UnstoppablePawnValue - Value(0x40 * movesToGo[BLACK]); else if (hasUnstoppable[BLACK] && hasUnstoppable[WHITE]) { // Both sides have unstoppable pawns! Try to find out who queens @@ -1146,8 +1143,8 @@ namespace { behindFriendlyPawns |= (behindFriendlyPawns << 16); } - int space = count_1s_max_15(safeSquares) - + count_1s_max_15(behindFriendlyPawns & safeSquares); + 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); }