X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=0adb388923bd78145e483ca134103b36568fee2f;hp=9c5c12b8b7003c62d31d66064f2840bf1355cece;hb=ce6b7a1b859ab1b416e6df5bddfc942c9c2f9ae7;hpb=8863afeb84d28716cfb5907044bc4e2a00230d42 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 9c5c12b8..0adb3889 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -216,8 +216,8 @@ namespace { template void init_eval_info(const Position& pos, EvalInfo& ei); - template - Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility); + template + Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility, Bitboard* mobilityArea); template Score evaluate_king(const Position& pos, const EvalInfo& ei); @@ -319,9 +319,15 @@ Value do_evaluate(const Position& pos) { init_eval_info(pos, ei); init_eval_info(pos, ei); - // Evaluate pieces and mobility - score += evaluate_pieces(pos, ei, mobility); + ei.attackedBy[WHITE][ALL_PIECES] |= ei.attackedBy[WHITE][KING]; + ei.attackedBy[BLACK][ALL_PIECES] |= ei.attackedBy[BLACK][KING]; + + // Do not include in mobility squares protected by enemy pawns or occupied by our pieces + Bitboard mobilityArea[] = { ~(ei.attackedBy[BLACK][PAWN] | pos.pieces(WHITE, PAWN, KING)), + ~(ei.attackedBy[WHITE][PAWN] | pos.pieces(BLACK, PAWN, KING)) }; + // Evaluate pieces and mobility + score += evaluate_pieces(pos, ei, mobility, mobilityArea); score += apply_weight(mobility[WHITE] - mobility[BLACK], Weights[Mobility]); // Evaluate kings after all other pieces because we need complete attack @@ -383,6 +389,8 @@ Value do_evaluate(const Position& pos) { Tracing::add_term(Tracing::PST, pos.psq_score()); Tracing::add_term(Tracing::IMBALANCE, ei.mi->material_value()); Tracing::add_term(PAWN, ei.pi->pawns_value()); + Tracing::add_term(Tracing::MOBILITY, apply_weight(mobility[WHITE], Weights[Mobility]) + , apply_weight(mobility[BLACK], Weights[Mobility])); Score w = ei.mi->space_weight() * evaluate_space(pos, ei); Score b = ei.mi->space_weight() * evaluate_space(pos, ei); Tracing::add_term(Tracing::SPACE, apply_weight(w, Weights[Space]), apply_weight(b, Weights[Space])); @@ -407,7 +415,7 @@ Value do_evaluate(const Position& pos) { ei.pinnedPieces[Us] = pos.pinned_pieces(Us); Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from(pos.king_square(Them)); - ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us); + ei.attackedBy[Us][ALL_PIECES] = ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us); // Init king safety tables only if we are going to use them if (pos.count(Us) && pos.non_pawn_material(Us) > QueenValueMg + PawnValueMg) @@ -452,7 +460,7 @@ Value do_evaluate(const Position& pos) { // evaluate_pieces() assigns bonuses and penalties to the pieces of a given color template - Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility, Bitboard mobilityArea) { + Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility, Bitboard* mobilityArea) { Bitboard b; Square s; @@ -473,7 +481,7 @@ Value do_evaluate(const Position& pos) { if (ei.pinnedPieces[Us] & s) b &= LineBB[pos.king_square(Us)][s]; - ei.attackedBy[Us][Pt] |= b; + ei.attackedBy[Us][ALL_PIECES] |= ei.attackedBy[Us][Pt] |= b; if (b & ei.kingRing[Them]) { @@ -489,8 +497,8 @@ Value do_evaluate(const Position& pos) { | ei.attackedBy[Them][BISHOP] | ei.attackedBy[Them][ROOK]); - int mob = Pt != QUEEN ? popcount(b & mobilityArea) - : popcount(b & mobilityArea); + int mob = Pt != QUEEN ? popcount(b & mobilityArea[Us]) + : popcount(b & mobilityArea[Us]); mobility[Us] += MobilityBonus[Pt][mob]; @@ -572,47 +580,16 @@ Value do_evaluate(const Position& pos) { if (Trace) Tracing::terms[Us][Pt] = score; - return score; - } - + const PieceType NextPt = (Us == WHITE ? Pt : PieceType(Pt + 1)); - // evaluate_pieces() assigns bonuses and penalties to all the pieces of both colors - - template - Score evaluate_pieces(const Position& pos, EvalInfo& ei, Score* mobility) { - - // Do not include in mobility squares protected by enemy pawns or occupied by our pieces - const Bitboard whiteMobilityArea = ~(ei.attackedBy[BLACK][PAWN] | pos.pieces(WHITE, PAWN, KING)); - const Bitboard blackMobilityArea = ~(ei.attackedBy[WHITE][PAWN] | pos.pieces(BLACK, PAWN, KING)); - - Score score; - - score = evaluate_pieces(pos, ei, mobility, whiteMobilityArea) - - evaluate_pieces(pos, ei, mobility, blackMobilityArea); - score += evaluate_pieces(pos, ei, mobility, whiteMobilityArea) - - evaluate_pieces(pos, ei, mobility, blackMobilityArea); - score += evaluate_pieces< ROOK, WHITE, Trace>(pos, ei, mobility, whiteMobilityArea) - - evaluate_pieces< ROOK, BLACK, Trace>(pos, ei, mobility, blackMobilityArea); - score += evaluate_pieces< QUEEN, WHITE, Trace>(pos, ei, mobility, whiteMobilityArea) - - evaluate_pieces< QUEEN, BLACK, Trace>(pos, ei, mobility, blackMobilityArea); - - // Sum up all attacked squares (updated in evaluate_pieces) - ei.attackedBy[WHITE][ALL_PIECES] = ei.attackedBy[WHITE][PAWN] | ei.attackedBy[WHITE][KNIGHT] - | ei.attackedBy[WHITE][BISHOP] | ei.attackedBy[WHITE][ROOK] - | ei.attackedBy[WHITE][QUEEN] | ei.attackedBy[WHITE][KING]; - - ei.attackedBy[BLACK][ALL_PIECES] = ei.attackedBy[BLACK][PAWN] | ei.attackedBy[BLACK][KNIGHT] - | ei.attackedBy[BLACK][BISHOP] | ei.attackedBy[BLACK][ROOK] - | ei.attackedBy[BLACK][QUEEN] | ei.attackedBy[BLACK][KING]; - if (Trace) - { - Tracing::terms[WHITE][Tracing::MOBILITY] = apply_weight(mobility[WHITE], Weights[Mobility]); - Tracing::terms[BLACK][Tracing::MOBILITY] = apply_weight(mobility[BLACK], Weights[Mobility]); - } - - return score; + return score - evaluate_pieces(pos, ei, mobility, mobilityArea); } + template<> + Score evaluate_pieces(const Position&, EvalInfo&, Score*, Bitboard*) { return SCORE_ZERO; } + template<> + Score evaluate_pieces(const Position&, EvalInfo&, Score*, Bitboard*) { return SCORE_ZERO; } + // evaluate_king() assigns bonuses and penalties to a king of a given color