X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=02d740eccbc765b32386592fdab902e2a7c31d3f;hp=cb5e284644e92bbbc0f548e281c1d0cc2c451fde;hb=d810441b359508577b736d7b6410190ba13078f5;hpb=d3fe153fe6fcf36ccfc0a61681c16f1a98fcddf2 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index cb5e2846..02d740ec 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -24,52 +24,12 @@ #include "bitcount.h" #include "evaluate.h" -#include "material.h" -#include "pawns.h" #include "thread.h" #include "ucioption.h" -namespace { +using namespace Eval; - // Struct EvalInfo contains various information computed and collected - // by the evaluation functions. - struct EvalInfo { - - // Pointers to material and pawn hash table entries - Material::Entry* mi; - Pawns::Entry* pi; - - // attackedBy[color][piece type] is a bitboard representing all squares - // attacked by a given color and piece type, attackedBy[color][ALL_PIECES] - // contains all squares attacked by the given color. - Bitboard attackedBy[COLOR_NB][PIECE_TYPE_NB]; - - // kingRing[color] is the zone around the king which is considered - // by the king safety evaluation. This consists of the squares directly - // adjacent to the king, and the three (or two, for a king on an edge file) - // squares two ranks in front of the king. For instance, if black's king - // is on g8, kingRing[BLACK] is a bitboard containing the squares f8, h8, - // f7, g7, h7, f6, g6 and h6. - Bitboard kingRing[COLOR_NB]; - - // kingAttackersCount[color] is the number of pieces of the given color - // which attack a square in the kingRing of the enemy king. - int kingAttackersCount[COLOR_NB]; - - // kingAttackersWeight[color] is the sum of the "weight" of the pieces of the - // given color which attack a square in the kingRing of the enemy king. The - // weights of the individual piece types are given by the variables - // QueenAttackWeight, RookAttackWeight, BishopAttackWeight and - // KnightAttackWeight in evaluate.cpp - int kingAttackersWeight[COLOR_NB]; - - // kingAdjacentZoneAttacksCount[color] is the number of attacks to squares - // directly adjacent to the king of the given color. Pieces which attack - // more than one square are counted multiple times. For instance, if black's - // king is on g8 and there's a white knight on g5, this knight adds - // 2 to kingAdjacentZoneAttacksCount[BLACK]. - int kingAdjacentZoneAttacksCount[COLOR_NB]; - }; +namespace { // Evaluation grain size, must be a power of 2 const int GrainSize = 8; @@ -88,7 +48,7 @@ namespace { // // Values modified by Joona Kiiski const Score WeightsInternal[] = { - S(252, 344), S(216, 266), S(46, 0), S(247, 0), S(259, 0) + S(289, 344), S(221, 273), S(46, 0), S(271, 0), S(307, 0) }; // MobilityBonus[PieceType][attacked] contains mobility bonuses for middle and @@ -156,12 +116,12 @@ namespace { const Score Tempo = make_score(24, 11); // Rooks and queens on the 7th rank - const Score RookOn7thBonus = make_score(3, 20); - const Score QueenOn7thBonus = make_score(1, 8); + const Score RookOn7thBonus = make_score(11, 20); + const Score QueenOn7thBonus = make_score( 3, 8); // Rooks and queens attacking pawns on the same rank - const Score RookOnPawnBonus = make_score(3, 48); - const Score QueenOnPawnBonus = make_score(1, 40); + const Score RookOnPawnBonus = make_score(10, 28); + const Score QueenOnPawnBonus = make_score( 4, 20); // Rooks on open files (modified by Joona Kiiski) const Score RookOpenFileBonus = make_score(43, 21); @@ -171,6 +131,9 @@ namespace { // right to castle. const Value TrappedRookPenalty = Value(180); + // Penalty for bishop with pawns on the same coloured squares + const Score BishopPawnsPenalty = make_score(8, 12); + // Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by // a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only // happen in Chess960 games. @@ -237,27 +200,27 @@ namespace { // Function prototypes template - Value do_evaluate(const Position& pos, Value& margin); + Value do_evaluate(const Position& pos, Value& margin, Info& ei); template - void init_eval_info(const Position& pos, EvalInfo& ei); + void init_eval_info(const Position& pos, Info& ei); template - Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei, Score& mobility); + Score evaluate_pieces_of_color(const Position& pos, Info& ei, Score& mobility); template - Score evaluate_king(const Position& pos, EvalInfo& ei, Value margins[]); + Score evaluate_king(const Position& pos, Info& ei, Value margins[]); template - Score evaluate_threats(const Position& pos, EvalInfo& ei); + Score evaluate_threats(const Position& pos, Info& ei); template - int evaluate_space(const Position& pos, EvalInfo& ei); + int evaluate_space(const Position& pos, Info& ei); template - Score evaluate_passed_pawns(const Position& pos, EvalInfo& ei); + Score evaluate_passed_pawns(const Position& pos, Info& ei); - Score evaluate_unstoppable_pawns(const Position& pos, EvalInfo& ei); + Score evaluate_unstoppable_pawns(const Position& pos, Info& ei); Value interpolate(const Score& v, Phase ph, ScaleFactor sf); Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight); @@ -273,8 +236,8 @@ namespace Eval { /// values, an endgame score and a middle game score, and interpolates /// between them based on the remaining material. - Value evaluate(const Position& pos, Value& margin) { - return do_evaluate(pos, margin); + Value evaluate(const Position& pos, Value& margin, Info* ei) { + return do_evaluate(pos, margin, *ei); } @@ -289,14 +252,6 @@ namespace Eval { Weights[KingDangerUs] = weight_option("Cowardice", "Cowardice", WeightsInternal[KingDangerUs]); Weights[KingDangerThem] = weight_option("Aggressiveness", "Aggressiveness", WeightsInternal[KingDangerThem]); - // King safety is asymmetrical. Our king danger level is weighted by - // "Cowardice" UCI parameter, instead the opponent one by "Aggressiveness". - // If running in analysis mode, make sure we use symmetrical king safety. We - // do this by replacing both Weights[kingDangerUs] and Weights[kingDangerThem] - // by their average. - if (Options["UCI_AnalyseMode"]) - Weights[KingDangerUs] = Weights[KingDangerThem] = (Weights[KingDangerUs] + Weights[KingDangerThem]) / 2; - const int MaxSlope = 30; const int Peak = 1280; @@ -318,6 +273,7 @@ namespace Eval { Value margin; std::string totals; + Info ei; Search::RootColor = pos.side_to_move(); @@ -325,7 +281,7 @@ namespace Eval { TraceStream << std::showpoint << std::showpos << std::fixed << std::setprecision(2); memset(TracedScores, 0, 2 * 16 * sizeof(Score)); - do_evaluate(pos, margin); + do_evaluate(pos, margin, ei); totals = TraceStream.str(); TraceStream.str(""); @@ -361,11 +317,10 @@ namespace Eval { namespace { template -Value do_evaluate(const Position& pos, Value& margin) { +Value do_evaluate(const Position& pos, Value& margin, Info& ei) { assert(!pos.checkers()); - EvalInfo ei; Value margins[COLOR_NB]; Score score, mobilityWhite, mobilityBlack; Thread* th = pos.this_thread(); @@ -488,7 +443,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // pawn attacks. To be done at the beginning of the evaluation. template - void init_eval_info(const Position& pos, EvalInfo& ei) { + void init_eval_info(const Position& pos, Info& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE); @@ -511,7 +466,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // evaluate_outposts() evaluates bishop and knight outposts squares template - Score evaluate_outposts(const Position& pos, EvalInfo& ei, Square s) { + Score evaluate_outposts(const Position& pos, Info& ei, Square s) { const Color Them = (Us == WHITE ? BLACK : WHITE); @@ -537,7 +492,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // 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, Info& ei, Score& mobility, Bitboard mobilityArea) { Bitboard b; Square s, ksq; @@ -590,6 +545,10 @@ Value do_evaluate(const Position& pos, Value& margin) { && !more_than_one(BetweenBB[s][pos.king_square(Them)] & pos.pieces())) score += BishopPinBonus; + // Penalty for bishop with same coloured pawns + if (Piece == BISHOP) + score -= BishopPawnsPenalty * ei.pi->pawns_on_same_color_squares(Us, s); + // Bishop and knight outposts squares if ( (Piece == BISHOP || Piece == KNIGHT) && !(pos.pieces(Them, PAWN) & attack_span_mask(Us, s))) @@ -682,7 +641,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // and the type of attacked one. template - Score evaluate_threats(const Position& pos, EvalInfo& ei) { + Score evaluate_threats(const Position& pos, Info& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE); @@ -724,7 +683,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // pieces of a given color. template - Score evaluate_pieces_of_color(const Position& pos, EvalInfo& ei, Score& mobility) { + Score evaluate_pieces_of_color(const Position& pos, Info& ei, Score& mobility) { const Color Them = (Us == WHITE ? BLACK : WHITE); @@ -749,7 +708,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // evaluate_king<>() assigns bonuses and penalties to a king of a given color template - Score evaluate_king(const Position& pos, EvalInfo& ei, Value margins[]) { + Score evaluate_king(const Position& pos, Info& ei, Value margins[]) { const Color Them = (Us == WHITE ? BLACK : WHITE); @@ -862,7 +821,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // evaluate_passed_pawns<>() evaluates the passed pawns of the given color template - Score evaluate_passed_pawns(const Position& pos, EvalInfo& ei) { + Score evaluate_passed_pawns(const Position& pos, Info& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE); @@ -960,7 +919,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // evaluate_unstoppable_pawns() evaluates the unstoppable passed pawns for both sides, this is quite // conservative and returns a winning score only when we are very sure that the pawn is winning. - Score evaluate_unstoppable_pawns(const Position& pos, EvalInfo& ei) { + Score evaluate_unstoppable_pawns(const Position& pos, Info& ei) { Bitboard b, b2, blockers, supporters, queeningPath, candidates; Square s, blockSq, queeningSquare; @@ -1125,7 +1084,7 @@ Value do_evaluate(const Position& pos, Value& margin) { // twice. Finally, the space bonus is scaled by a weight taken from the // material hash table. The aim is to improve play on game opening. template - int evaluate_space(const Position& pos, EvalInfo& ei) { + int evaluate_space(const Position& pos, Info& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE);