X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=269e80624588c8267cfe31b29fe41e8aba8053b6;hp=23597231641f1215deff1b72d5d52f0776ee7bf0;hb=a96cba0ec89e5a3bbd435fccca652678c9fd20a7;hpb=5cacefe7c67b34dafe494e5155bce717289eeaf1 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 23597231..269e8062 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -559,17 +559,24 @@ namespace { // evaluate_common() computes terms common to all pieces attack - int evaluate_common(const Position&p, const Bitboard& b, Color us, EvalInfo& ei, - int AttackWeight, const Value* mgBonus, const Value* egBonus, - Square s = SQ_NONE, const Value* OutpostBonus = NULL) { + template + int evaluate_common(const Position& p, const Bitboard& b, Color us, EvalInfo& ei, Square s = SQ_NONE) { + + 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 if (b & ei.kingZone[us]) { ei.kingAttackersCount[us]++; - ei.kingAttackersWeight[us] += AttackWeight; + ei.kingAttackersWeight[us] += AttackWeight[Piece]; Bitboard bb = (b & ei.attackedBy[them][KING]); if (bb) ei.kingAdjacentZoneAttacksCount[us] += count_1s_max_15(bb); @@ -579,17 +586,20 @@ namespace { Bitboard bb = (b & ~ei.attackedBy[them][PAWN]); // Mobility - int mob = count_1s_max_15(bb & ~p.pieces_of_color(us)); - ei.mgMobility += Sign[us] * mgBonus[mob]; - ei.egMobility += Sign[us] * egBonus[mob]; + 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]; // Bishop and Knight outposts - if (!OutpostBonus || !p.square_is_weak(s, them)) + if ( (Piece != BISHOP && Piece != KNIGHT) // compile time condition + || !p.square_is_weak(s, them)) return mob; // Initial bonus based on square Value v, bonus; - v = bonus = OutpostBonus[relative_square(us, s)]; + 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 @@ -609,42 +619,34 @@ 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) { + void evaluate_knight(const Position& p, Square s, Color us, EvalInfo& ei) { - Bitboard b = p.piece_attacks(s); - ei.attackedBy[us][KNIGHT] |= b; - - // King attack, mobility and outposts - evaluate_common(p, b, us, ei, KnightAttackWeight, MidgameKnightMobilityBonus, - EndgameKnightMobilityBonus, s, KnightOutpostBonus); + // 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) { + void evaluate_bishop(const Position& p, Square s, Color us, EvalInfo& ei) { Bitboard b = bishop_attacks_bb(s, p.occupied_squares() & ~p.queens(us)); - ei.attackedBy[us][BISHOP] |= b; - // King attack, mobility and outposts - evaluate_common(p, b, us, ei, BishopAttackWeight, MidgameBishopMobilityBonus, - EndgameBishopMobilityBonus, s, BishopOutpostBonus); + // 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) { + 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)); - ei.attackedBy[us][ROOK] |= b; - // King attack and mobility - int mob = evaluate_common(p, b, us, ei, RookAttackWeight, MidgameRookMobilityBonus, - EndgameRookMobilityBonus); + // Attacks and mobility + int mob = evaluate_common(p, b, us, ei); // Rook on 7th rank Color them = opposite_color(us); @@ -703,14 +705,10 @@ namespace { // evaluate_queen() assigns bonuses and penalties to a queen of a given // color on a given square. - void evaluate_queen(const Position &p, Square s, Color us, EvalInfo &ei) { - - Bitboard b = p.piece_attacks(s); - ei.attackedBy[us][QUEEN] |= b; + void evaluate_queen(const Position& p, Square s, Color us, EvalInfo& ei) { - // King attack and mobility - evaluate_common(p, b, us, ei, QueenAttackWeight, MidgameQueenMobilityBonus, - EndgameQueenMobilityBonus); + // Attacks and mobility + evaluate_common(p, p.piece_attacks(s), us, ei); // Queen on 7th rank Color them = opposite_color(us); @@ -731,7 +729,7 @@ namespace { // evaluate_king() assigns bonuses and penalties to a king of a given // color on a given square. - void evaluate_king(const Position &p, Square s, Color us, EvalInfo &ei) { + void evaluate_king(const Position& p, Square s, Color us, EvalInfo& ei) { int shelter = 0, sign = Sign[us]; @@ -920,7 +918,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); @@ -1071,12 +1069,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) { @@ -1093,12 +1091,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) {