From: Marco Costalba Date: Sun, 22 Feb 2015 13:19:12 +0000 (+0100) Subject: Sync with master X-Git-Url: https://git.sesse.net/?p=stockfish;a=commitdiff_plain;h=8d16111ffde1689d48d47ec379ba91613213183c;hp=-c Sync with master bench: 8253813 --- 8d16111ffde1689d48d47ec379ba91613213183c diff --combined src/evaluate.cpp index 6c46cb4b,77096c9b..1593a68c --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@@ -61,11 -61,11 +61,11 @@@ namespace // KingAttackWeights array. 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]. + // kingAdjacentZoneAttacksCount[color] is the number of attacks by the given + // color to squares directly adjacent to the enemy king. Pieces which attack + // more than one square are counted multiple times. For instance, if there is + // a white knight on g5 and black's king is on g8, this white knight adds 2 + // to kingAdjacentZoneAttacksCount[WHITE]. int kingAdjacentZoneAttacksCount[COLOR_NB]; Bitboard pinnedPieces[COLOR_NB]; @@@ -73,17 -73,18 +73,17 @@@ namespace Tracing { - enum Terms { // First 8 entries are for PieceType + enum Term { // First 8 entries are for PieceType MATERIAL = 8, IMBALANCE, MOBILITY, THREAT, PASSED, SPACE, TOTAL, TERMS_NB }; Score scores[COLOR_NB][TERMS_NB]; - EvalInfo ei; - ScaleFactor sf; + + std::ostream& operator<<(std::ostream& os, Term idx); double to_cp(Value v); void write(int idx, Color c, Score s); void write(int idx, Score w, Score b = SCORE_ZERO); - void print(std::stringstream& ss, const char* name, int idx); std::string do_trace(const Position& pos); } @@@ -116,8 -117,8 +116,8 @@@ S( 25, 41), S( 25, 41), S(25, 41), S(25, 41) } }; - // Outpost[PieceType][Square] contains bonuses for knights and bishops outposts, - // indexed by piece type and square (from white's point of view). + // Outpost[Bishop/Knight][Square] contains bonuses for knights and bishops + // outposts, indexed by piece type and square (from white's point of view). const Value Outpost[][SQUARE_NB] = { {// A B C D E F G H V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Knights @@@ -146,7 -147,7 +146,7 @@@ // ThreatenedByPawn[PieceType] contains a penalty according to which piece // type is attacked by an enemy pawn. - const Score ThreatenedByPawn[] = { + const Score ThreatenedByPawn[PIECE_TYPE_NB] = { S(0, 0), S(0, 0), S(87, 118), S(84, 122), S(114, 203), S(121, 217) }; @@@ -162,7 -163,7 +162,7 @@@ const Score Unstoppable = S( 0, 20); const Score Hanging = S(31, 26); const Score PawnAttackThreat = S(20, 20); - const Score PawnSafePush = S( 5 , 5); + const Score PawnSafePush = S( 5, 5); // 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 @@@ -176,7 -177,7 +176,7 @@@ // by the space evaluation. In the middlegame, each side is given a bonus // based on how many squares inside this area are safe and available for // friendly minor pieces. - const Bitboard SpaceMask[] = { + const Bitboard SpaceMask[COLOR_NB] = { (FileCBB | FileDBB | FileEBB | FileFBB) & (Rank2BB | Rank3BB | Rank4BB), (FileCBB | FileDBB | FileEBB | FileFBB) & (Rank7BB | Rank6BB | Rank5BB) }; @@@ -187,7 -188,7 +187,7 @@@ // index to KingDanger[]. // // KingAttackWeights[PieceType] contains king attack weights by piece type - const int KingAttackWeights[] = { 0, 0, 7, 5, 4, 1 }; + const int KingAttackWeights[PIECE_TYPE_NB] = { 0, 0, 7, 5, 4, 1 }; // Bonuses for enemy's safe checks const int QueenContactCheck = 89; @@@ -213,12 -214,13 +213,12 @@@ template void init_eval_info(const Position& pos, EvalInfo& ei) { - const Color Them = (Us == WHITE ? BLACK : WHITE); + const Color Them = (Us == WHITE ? BLACK : WHITE); const Square Down = (Us == WHITE ? DELTA_S : DELTA_N); ei.pinnedPieces[Us] = pos.pinned_pieces(Us); - - Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from(pos.king_square(Them)); ei.attackedBy[Us][ALL_PIECES] = ei.attackedBy[Us][PAWN] = ei.pi->pawn_attacks(Us); + Bitboard b = ei.attackedBy[Them][KING] = pos.attacks_from(pos.king_square(Them)); // Init king safety tables only if we are going to use them if (pos.non_pawn_material(Us) >= QueenValueMg) @@@ -802,7 -804,7 +802,7 @@@ v /= int(PHASE_MIDGAME); - // In case of tracing add all single evaluation contributions for both white and black + // In case of tracing add all single evaluation terms for both white and black if (Trace) { Tracing::write(Tracing::MATERIAL, pos.psq_score()); @@@ -813,37 -815,46 +813,37 @@@ Tracing::write(Tracing::SPACE, apply_weight(evaluate_space(pos, ei), Weights[Space]) , apply_weight(evaluate_space(pos, ei), Weights[Space])); Tracing::write(Tracing::TOTAL, score); - Tracing::ei = ei; - Tracing::sf = sf; } return (pos.side_to_move() == WHITE ? v : -v) + Eval::Tempo; } - // Tracing function definitions + // Tracing functions double Tracing::to_cp(Value v) { return double(v) / PawnValueEg; } void Tracing::write(int idx, Color c, Score s) { scores[c][idx] = s; } void Tracing::write(int idx, Score w, Score b) { - - write(idx, WHITE, w); - write(idx, BLACK, b); + scores[WHITE][idx] = w, scores[BLACK][idx] = b; } - void Tracing::print(std::stringstream& ss, const char* name, int idx) { - - Score wScore = scores[WHITE][idx]; - Score bScore = scores[BLACK][idx]; - - switch (idx) { - case MATERIAL: case IMBALANCE: case PAWN: case TOTAL: - ss << std::setw(15) << name << " | --- --- | --- --- | " - << std::setw(5) << to_cp(mg_value(wScore - bScore)) << " " - << std::setw(5) << to_cp(eg_value(wScore - bScore)) << " \n"; - break; - default: - ss << std::setw(15) << name << " | " << std::noshowpos - << std::setw(5) << to_cp(mg_value(wScore)) << " " - << std::setw(5) << to_cp(eg_value(wScore)) << " | " - << std::setw(5) << to_cp(mg_value(bScore)) << " " - << std::setw(5) << to_cp(eg_value(bScore)) << " | " - << std::setw(5) << to_cp(mg_value(wScore - bScore)) << " " - << std::setw(5) << to_cp(eg_value(wScore - bScore)) << " \n"; - } + std::ostream& Tracing::operator<<(std::ostream& os, Term t) { + + double wScore[] = { to_cp(mg_value(scores[WHITE][t])), to_cp(eg_value(scores[WHITE][t])) }; + double bScore[] = { to_cp(mg_value(scores[BLACK][t])), to_cp(eg_value(scores[BLACK][t])) }; + + if (t == MATERIAL || t == IMBALANCE || t == Term(PAWN) || t == TOTAL) + os << " --- --- | --- --- | "; + else + os << std::setw(5) << wScore[MG] << " " << std::setw(5) << wScore[EG] << " | " + << std::setw(5) << bScore[MG] << " " << std::setw(5) << bScore[EG] << " | "; + + os << std::setw(5) << wScore[MG] - bScore[MG] << " " + << std::setw(5) << wScore[EG] - bScore[EG] << " \n"; + + return os; } std::string Tracing::do_trace(const Position& pos) { @@@ -857,21 -868,23 +857,21 @@@ ss << std::showpoint << std::noshowpos << std::fixed << std::setprecision(2) << " Eval term | White | Black | Total \n" << " | MG EG | MG EG | MG EG \n" - << "----------------+-------------+-------------+-------------\n"; - - print(ss, "Material", MATERIAL); - print(ss, "Imbalance", IMBALANCE); - print(ss, "Pawns", PAWN); - print(ss, "Knights", KNIGHT); - print(ss, "Bishops", BISHOP); - print(ss, "Rooks", ROOK); - print(ss, "Queens", QUEEN); - print(ss, "Mobility", MOBILITY); - print(ss, "King safety", KING); - print(ss, "Threats", THREAT); - print(ss, "Passed pawns", PASSED); - print(ss, "Space", SPACE); - - ss << "----------------+-------------+-------------+-------------\n"; - print(ss, "Total", TOTAL); + << "----------------+-------------+-------------+-------------\n" + << " Material | " << Term(MATERIAL) + << " Imbalance | " << Term(IMBALANCE) + << " Pawns | " << Term(PAWN) + << " Knights | " << Term(KNIGHT) + << " Bishop | " << Term(BISHOP) + << " Rooks | " << Term(ROOK) + << " Queens | " << Term(QUEEN) + << " Mobility | " << Term(MOBILITY) + << " King safety | " << Term(KING) + << " Threats | " << Term(THREAT) + << " Passed pawns | " << Term(PASSED) + << " Space | " << Term(SPACE) + << "----------------+-------------+-------------+-------------\n" + << " Total | " << Term(TOTAL); ss << "\nTotal Evaluation: " << to_cp(v) << " (white side)\n";