X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=c29fd5e651a46bd5a46af414b256f2923f6a029d;hp=c2e03d97e25564e5d1b8b80309fe5eec6b9262bc;hb=a9e55d43262d11a916bdfa68cd1de0174d884cd3;hpb=bdbbc4e06bbc1d8437cfdc31cc35006f1ee5f0c9 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index c2e03d97..c29fd5e6 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -58,15 +58,17 @@ namespace { // weights read from UCI parameters. The purpose is to be able to change // the evaluation weights while keeping the default values of the UCI // parameters at 100, which looks prettier. - const int WeightMobilityMidgameInternal = 0x100; - const int WeightMobilityEndgameInternal = 0x100; - const int WeightPawnStructureMidgameInternal = 0x100; - const int WeightPawnStructureEndgameInternal = 0x100; - const int WeightPassedPawnsMidgameInternal = 0x100; - const int WeightPassedPawnsEndgameInternal = 0x100; - const int WeightKingSafetyInternal = 0x110; - const int WeightKingOppSafetyInternal = 0x110; - const int WeightSpaceInternal = 0x30; + // + // Values modified by Joona Kiiski + const int WeightMobilityMidgameInternal = 0x0FA; + const int WeightMobilityEndgameInternal = 0x10A; + const int WeightPawnStructureMidgameInternal = 0x0EC; + const int WeightPawnStructureEndgameInternal = 0x0CD; + const int WeightPassedPawnsMidgameInternal = 0x108; + const int WeightPassedPawnsEndgameInternal = 0x109; + const int WeightKingSafetyInternal = 0x0F7; + const int WeightKingOppSafetyInternal = 0x101; + const int WeightSpaceInternal = 0x02F; // Visually better to define tables constants typedef Value V; @@ -167,18 +169,19 @@ namespace { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) // 8 }; - // Bonus for unstoppable passed pawns: + // Bonus for unstoppable passed pawns const Value UnstoppablePawnValue = Value(0x500); - // Rooks and queens on the 7th rank: - const Value MidgameRookOn7thBonus = Value(50); - const Value EndgameRookOn7thBonus = Value(100); - const Value MidgameQueenOn7thBonus = Value(25); - const Value EndgameQueenOn7thBonus = Value(50); + // Rooks and queens on the 7th rank + const Value MidgameRookOn7thBonus = Value(47); + const Value EndgameRookOn7thBonus = Value(98); + const Value MidgameQueenOn7thBonus = Value(27); + const Value EndgameQueenOn7thBonus = Value(54); - // Rooks on open files: - const Value RookOpenFileBonus = Value(40); - const Value RookHalfOpenFileBonus = Value(20); + + // Rooks on open files + const Value RookOpenFileBonus = Value(43); + const Value RookHalfOpenFileBonus = Value(19); // Penalty for rooks trapped inside a friendly king which has lost the // right to castle: @@ -272,11 +275,11 @@ namespace { uint8_t BitCount8Bit[256]; // Function prototypes - void evaluate_knight(const Position &p, Square s, Color us, EvalInfo &ei); - void evaluate_bishop(const Position &p, Square s, Color us, EvalInfo &ei); - void evaluate_rook(const Position &p, Square s, Color us, EvalInfo &ei); - void evaluate_queen(const Position &p, Square s, Color us, EvalInfo &ei); - void evaluate_king(const Position &p, Square s, Color us, EvalInfo &ei); + template + void evaluate_pieces(const Position& p, Color us, EvalInfo& ei); + + template<> + void evaluate_pieces(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, @@ -352,52 +355,22 @@ Value evaluate(const Position &pos, EvalInfo &ei, int threadID) { // Evaluate pieces for (Color c = WHITE; c <= BLACK; c++) { - // Knights - for (int i = 0; i < pos.piece_count(c, KNIGHT); i++) - evaluate_knight(pos, pos.piece_list(c, KNIGHT, i), c, ei); - - // Bishops - for (int i = 0; i < pos.piece_count(c, BISHOP); i++) - evaluate_bishop(pos, pos.piece_list(c, BISHOP, i), c, ei); - - // Rooks - for (int i = 0; i < pos.piece_count(c, ROOK); i++) - evaluate_rook(pos, pos.piece_list(c, ROOK, i), c, ei); - - // Queens - for(int i = 0; i < pos.piece_count(c, QUEEN); i++) - evaluate_queen(pos, pos.piece_list(c, QUEEN, i), c, ei); - - // Special pattern: trapped bishops on a7/h7/a2/h2 - Bitboard b = pos.bishops(c) & MaskA7H7[c]; - while (b) - { - Square s = pop_1st_bit(&b); - evaluate_trapped_bishop_a7h7(pos, s, c, ei); - } - - // Special pattern: trapped bishops on a1/h1/a8/h8 in Chess960: - if (Chess960) - { - b = pos.bishops(c) & MaskA1H1[c]; - while (b) - { - Square s = pop_1st_bit(&b); - evaluate_trapped_bishop_a1h1(pos, s, c, ei); - } - } - - // Sum up all attacked squares - ei.attackedBy[c][0] = ei.attackedBy[c][PAWN] | ei.attackedBy[c][KNIGHT] - | ei.attackedBy[c][BISHOP] | ei.attackedBy[c][ROOK] - | ei.attackedBy[c][QUEEN] | ei.attackedBy[c][KING]; + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + + // Sum up all attacked squares + ei.attackedBy[c][0] = ei.attackedBy[c][PAWN] | ei.attackedBy[c][KNIGHT] + | ei.attackedBy[c][BISHOP] | ei.attackedBy[c][ROOK] + | ei.attackedBy[c][QUEEN] | ei.attackedBy[c][KING]; } // 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_king(pos, pos.king_square(c), c, ei); + evaluate_pieces(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 @@ -517,7 +490,10 @@ void init_eval(int threads) { } for (Bitboard b = 0ULL; b < 256ULL; b++) - BitCount8Bit[b] = count_1s(b); + { + assert(count_1s(b) == int(uint8_t(count_1s(b)))); + BitCount8Bit[b] = (uint8_t)count_1s(b); + } } @@ -586,7 +562,9 @@ namespace { Bitboard bb = (b & ~ei.attackedBy[them][PAWN]); // Mobility - int mob = count_1s_max_15(bb & ~p.pieces_of_color(us)); + int mob = (Piece != QUEEN ? count_1s_max_15(bb & ~p.pieces_of_color(us)) + : count_1s(bb & ~p.pieces_of_color(us))); + ei.mgMobility += Sign[us] * MgBonus[Piece][mob]; ei.egMobility += Sign[us] * EgBonus[Piece][mob]; @@ -614,108 +592,101 @@ namespace { } - // evaluate_knight() assigns bonuses and penalties to a knight of a given - // color on a given square. - - void evaluate_knight(const Position& p, Square s, Color us, EvalInfo& ei) { - - // Attacks, mobility and outposts - evaluate_common(p, p.piece_attacks(s), us, ei, s); - } - - - // evaluate_bishop() assigns bonuses and penalties to a bishop of a given - // color on a given square. - - void evaluate_bishop(const Position& p, Square s, Color us, EvalInfo& ei) { + // evaluate_pieces<>() assigns bonuses and penalties to the pieces of a given + // color. - Bitboard b = bishop_attacks_bb(s, p.occupied_squares() & ~p.queens(us)); - - // Attacks, mobility and outposts - evaluate_common(p, b, us, ei, s); - } - - - // evaluate_rook() assigns bonuses and penalties to a rook of a given - // color on a given square. - - void evaluate_rook(const Position& p, Square s, Color us, EvalInfo& ei) { - - Bitboard b = rook_attacks_bb(s, p.occupied_squares() & ~p.rooks_and_queens(us)); - - // Attacks and mobility - int mob = evaluate_common(p, b, us, ei); + template + void evaluate_pieces(const Position& pos, Color us, EvalInfo& ei) { - // Rook on 7th rank - Color them = opposite_color(us); + Bitboard b; + Square s, ksq; + Color them; + int mob; + File f; - if ( relative_rank(us, s) == RANK_7 - && relative_rank(us, p.king_square(them)) == RANK_8) + for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++) { - ei.mgValue += Sign[us] * MidgameRookOn7thBonus; - ei.egValue += Sign[us] * EndgameRookOn7thBonus; - } + s = pos.piece_list(us, Piece, i); - // Open and half-open files - File f = square_file(s); - 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; - } - else - { - ei.mgValue += Sign[us] * RookHalfOpenFileBonus; - ei.egValue += Sign[us] * RookHalfOpenFileBonus; - } - } + if (Piece == KNIGHT || Piece == QUEEN) + b = pos.piece_attacks(s); + else if (Piece == BISHOP) + 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)); - // Penalize rooks which are trapped inside a king. Penalize more if - // king has lost right to castle - if (mob > 6 || ei.pi->file_is_half_open(us, f)) - return; + // Attacks, mobility and outposts + mob = evaluate_common(pos, b, us, ei, s); - Square ksq = p.king_square(us); + // Special patterns: trapped bishops on a7/h7/a2/h2 + // and trapped bishops on a1/h1/a8/h8 in Chess960. + if (Piece == BISHOP) + { + if (bit_is_set(MaskA7H7[us], s)) + evaluate_trapped_bishop_a7h7(pos, s, us, ei); - if ( square_file(ksq) >= FILE_E - && square_file(s) > square_file(ksq) - && (relative_rank(us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) - { - // 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 -= p.can_castle(us)? Sign[us] * ((TrappedRookPenalty - mob * 16) / 2) - : Sign[us] * (TrappedRookPenalty - mob * 16); - } - else if ( square_file(ksq) <= FILE_D - && square_file(s) < square_file(ksq) - && (relative_rank(us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) - { - // 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 -= p.can_castle(us)? Sign[us] * ((TrappedRookPenalty - mob * 16) / 2) - : Sign[us] * (TrappedRookPenalty - mob * 16); - } - } + if (Chess960 && bit_is_set(MaskA1H1[us], s)) + evaluate_trapped_bishop_a1h1(pos, s, us, ei); + } + if (Piece == ROOK || Piece == QUEEN) + { + // Queen or rook on 7th rank + them = opposite_color(us); - // evaluate_queen() assigns bonuses and penalties to a queen of a given - // color on a given square. + 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); + } + } - void evaluate_queen(const Position& p, Square s, Color us, EvalInfo& ei) { + // Special extra evaluation for rooks + if (Piece == ROOK) + { + // Open and half-open files + f = square_file(s); + 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; + } + else + { + ei.mgValue += Sign[us] * RookHalfOpenFileBonus; + ei.egValue += Sign[us] * RookHalfOpenFileBonus; + } + } - // Attacks and mobility - evaluate_common(p, p.piece_attacks(s), us, ei); + // Penalize rooks which are trapped inside a king. Penalize more if + // king has lost right to castle. + if (mob > 6 || ei.pi->file_is_half_open(us, f)) + continue; - // Queen on 7th rank - Color them = opposite_color(us); + ksq = pos.king_square(us); - if ( relative_rank(us, s) == RANK_7 - && relative_rank(us, p.king_square(them)) == RANK_8) - { - ei.mgValue += Sign[us] * MidgameQueenOn7thBonus; - ei.egValue += Sign[us] * EndgameQueenOn7thBonus; + if ( square_file(ksq) >= FILE_E + && square_file(s) > square_file(ksq) + && (relative_rank(us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) + { + // 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); + } + else if ( square_file(ksq) <= FILE_D + && square_file(s) < square_file(ksq) + && (relative_rank(us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) + { + // 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); + } + } } } @@ -724,12 +695,14 @@ namespace { return b >> (num << 3); } - // evaluate_king() assigns bonuses and penalties to a king of a given - // color on a given square. + // evaluate_pieces() assigns bonuses and penalties to a king of a given + // color. - void evaluate_king(const Position& p, Square s, Color us, EvalInfo& ei) { + template<> + void evaluate_pieces(const Position& p, Color us, EvalInfo& ei) { int shelter = 0, sign = Sign[us]; + Square s = p.king_square(us); // King shelter if (relative_rank(us, s) <= RANK_4) @@ -809,7 +782,7 @@ namespace { if ( bit_is_set(p.piece_attacks(from), to) && !bit_is_set(p.pinned_pieces(them), from) && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & p.rooks_and_queens(us)) - && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & p.rooks_and_queens(us))) + && !(bishop_attacks_bb(to, occ & ClearMaskBB[from]) & p.bishops_and_queens(us))) ei.mateThreat[them] = make_move(from, to); } @@ -916,7 +889,7 @@ namespace { { Square s = pop_1st_bit(&b); - assert(pos.piece_on(s) == pawn_of_color(us)); + assert(pos.piece_on(s) == piece_of_color_and_type(us, PAWN)); assert(pos.pawn_is_passed(us, s)); int r = int(relative_rank(us, s) - RANK_2); @@ -1067,12 +1040,12 @@ namespace { void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us, EvalInfo &ei) { assert(square_is_ok(s)); - assert(pos.piece_on(s) == bishop_of_color(us)); + assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP)); Square b6 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B6 : SQ_G6); Square b8 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B8 : SQ_G8); - if ( pos.piece_on(b6) == pawn_of_color(opposite_color(us)) + if ( pos.piece_on(b6) == piece_of_color_and_type(opposite_color(us), PAWN) && pos.see(s, b6) < 0 && pos.see(s, b8) < 0) { @@ -1089,12 +1062,12 @@ namespace { void evaluate_trapped_bishop_a1h1(const Position &pos, Square s, Color us, EvalInfo &ei) { - Piece pawn = pawn_of_color(us); + Piece pawn = piece_of_color_and_type(us, PAWN); Square b2, b3, c3; assert(Chess960); assert(square_is_ok(s)); - assert(pos.piece_on(s) == bishop_of_color(us)); + assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP)); if (square_file(s) == FILE_A) {