From: Marco Costalba Date: Thu, 19 Feb 2009 14:49:54 +0000 (+0100) Subject: Revert mobility of pinned pieces for now X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=7f4f18f959044ee964f8574e625484594c9974b1 Revert mobility of pinned pieces for now We will redo after rewriting the handling of pinned bitboard and its friends. --- diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 4984d08c..269e8062 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -272,11 +272,11 @@ namespace { uint8_t BitCount8Bit[256]; // Function prototypes - void evaluate_knight(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei); - void evaluate_bishop(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei); - void evaluate_rook(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei); - void evaluate_queen(const Position& p, Square s, Color us, Bitboard pinned, EvalInfo& ei); - void evaluate_king(const Position& p, Square s, Color us, EvalInfo& ei); + 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); void evaluate_passed_pawns(const Position &pos, EvalInfo &ei); void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us, @@ -352,23 +352,21 @@ Value evaluate(const Position &pos, EvalInfo &ei, int threadID) { // Evaluate pieces for (Color c = WHITE; c <= BLACK; c++) { - Bitboard pinned = pos.pinned_pieces(c); - // Knights for (int i = 0; i < pos.piece_count(c, KNIGHT); i++) - evaluate_knight(pos, pos.piece_list(c, KNIGHT, i), c, pinned, ei); + 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, pinned, ei); + 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, pinned, ei); + 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, pinned, ei); + 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]; @@ -562,14 +560,13 @@ namespace { // evaluate_common() computes terms common to all pieces attack template - int evaluate_common(const Position& p, const Bitboard& b, Color us, Bitboard pinned, EvalInfo& ei, Square s = SQ_NONE) { + 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 }; - int mob; Color them = opposite_color(us); // Update attack info @@ -585,20 +582,15 @@ namespace { ei.kingAdjacentZoneAttacksCount[us] += count_1s_max_15(bb); } - if (pinned && bit_is_set(pinned, s)) - mob = 0; - else - { - // Remove squares protected by enemy pawns - Bitboard bb = (b & ~ei.attackedBy[them][PAWN]); + // Remove squares protected by enemy pawns + Bitboard bb = (b & ~ei.attackedBy[them][PAWN]); - // Mobility - mob = (Piece != QUEEN ? count_1s_max_15(bb & ~p.pieces_of_color(us)) + // Mobility + 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]; - } + ei.mgMobility += Sign[us] * MgBonus[Piece][mob]; + ei.egMobility += Sign[us] * EgBonus[Piece][mob]; // Bishop and Knight outposts if ( (Piece != BISHOP && Piece != KNIGHT) // compile time condition @@ -627,34 +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, Bitboard pinned, EvalInfo& ei) { + void evaluate_knight(const Position& p, Square s, Color us, EvalInfo& ei) { // Attacks, mobility and outposts - evaluate_common(p, p.piece_attacks(s), us, pinned, ei, s); + 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, Bitboard pinned, 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)); // Attacks, mobility and outposts - evaluate_common(p, b, us, pinned, ei, s); + 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, Bitboard pinned, 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)); // Attacks and mobility - int mob = evaluate_common(p, b, us, pinned, ei); + int mob = evaluate_common(p, b, us, ei); // Rook on 7th rank Color them = opposite_color(us); @@ -713,10 +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, Bitboard pinned, EvalInfo& ei) { + void evaluate_queen(const Position& p, Square s, Color us, EvalInfo& ei) { // Attacks and mobility - evaluate_common(p, p.piece_attacks(s), us, pinned, ei); + evaluate_common(p, p.piece_attacks(s), us, ei); // Queen on 7th rank Color them = opposite_color(us);