X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=80f843e868eb4195b5637f67118a590acfd5fdcc;hp=9bb6c1c00516446bde294b38da18443c39da25d3;hb=fe76787a77747660712f54319d1a129319959319;hpb=11207f7c1f943aa02bccbfa5eff6fdd18859721f diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 9bb6c1c0..80f843e8 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -251,9 +251,8 @@ namespace { 15, 15, 15, 15, 15, 15, 15, 15 }; - // SafetyTable[] contains the actual king safety scores. It is initialized - // in init_safety(). - Value SafetyTable[100]; + // SafetyTable[color][] contains the actual king safety weighted scores + Score SafetyTable[2][128]; // Pawn and material hash tables, indexed by the current thread id. // Note that they will be initialized at 0 being global variables. @@ -280,7 +279,10 @@ namespace { template void evaluate_space(const Position& pos, EvalInfo& ei); + template void evaluate_passed_pawns(const Position& pos, EvalInfo& ei); + + void evaluate_unstoppable_pawns(const Position& pos, EvalInfo& ei); void evaluate_trapped_bishop_a7h7(const Position& pos, Square s, Color us, EvalInfo& ei); void evaluate_trapped_bishop_a1h1(const Position& pos, Square s, Color us, EvalInfo& ei); inline Score apply_weight(Score v, Score weight); @@ -308,6 +310,9 @@ namespace { template Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { + Bitboard b; + ScaleFactor factor[2]; + assert(pos.is_ok()); assert(threadID >= 0 && threadID < MAX_THREADS); assert(!pos.is_check()); @@ -328,7 +333,6 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { return ei.mi->evaluate(pos); // After get_material_info() call that modifies them - ScaleFactor factor[2]; factor[WHITE] = ei.mi->scale_factor(pos, WHITE); factor[BLACK] = ei.mi->scale_factor(pos, BLACK); @@ -344,14 +348,14 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { // Initialize pawn attack bitboards for both sides ei.attackedBy[WHITE][PAWN] = ei.pi->pawn_attacks(WHITE); - ei.attackedBy[BLACK][PAWN] = ei.pi->pawn_attacks(BLACK); - Bitboard b1 = ei.attackedBy[WHITE][PAWN] & ei.attackedBy[BLACK][KING]; - Bitboard b2 = ei.attackedBy[BLACK][PAWN] & ei.attackedBy[WHITE][KING]; - if (b1) - ei.kingAttackersCount[WHITE] = count_1s_max_15(b1)/2; + b = ei.attackedBy[WHITE][PAWN] & ei.attackedBy[BLACK][KING]; + if (b) + ei.kingAttackersCount[WHITE] = count_1s_max_15(b)/2; - if (b2) - ei.kingAttackersCount[BLACK] = count_1s_max_15(b2)/2; + ei.attackedBy[BLACK][PAWN] = ei.pi->pawn_attacks(BLACK); + b = ei.attackedBy[BLACK][PAWN] & ei.attackedBy[WHITE][KING]; + if (b) + ei.kingAttackersCount[BLACK] = count_1s_max_15(b)/2; // Evaluate pieces evaluate_pieces_of_color(pos, ei); @@ -363,23 +367,24 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { evaluate_king(pos, ei); evaluate_king(pos, ei); - // Evaluate tactical threats, we need full attack info + // Evaluate tactical threats, we need full attack info including king evaluate_threats(pos, ei); evaluate_threats(pos, ei); - // Evaluate passed pawns. We evaluate passed pawns for both sides at once, - // because we need to know which side promotes first in positions where - // both sides have an unstoppable passed pawn. To be called after all attacks - // are computed, included king. - if (ei.pi->passed_pawns()) - evaluate_passed_pawns(pos, ei); + // Evaluate passed pawns, we need full attack info including king + evaluate_passed_pawns(pos, ei); + evaluate_passed_pawns(pos, ei); + + // If one side has only a king, check whether exsists any unstoppable passed pawn + if (!pos.non_pawn_material(WHITE) || !pos.non_pawn_material(BLACK)) + evaluate_unstoppable_pawns(pos, ei); Phase phase = ei.mi->game_phase(); // Middle-game specific evaluation terms if (phase > PHASE_ENDGAME) { - // Pawn storms in positions with opposite castling. + // Pawn storms in positions with opposite castling if ( square_file(pos.king_square(WHITE)) >= FILE_E && square_file(pos.king_square(BLACK)) <= FILE_D) @@ -863,24 +868,20 @@ namespace { // that the king safety scores can sometimes be very big, and that // capturing a single attacking piece can therefore result in a score // change far bigger than the value of the captured piece. - Score v = apply_weight(make_score(SafetyTable[attackUnits], 0), WeightKingSafety[Us]); - ei.value -= Sign[Us] * v; - ei.futilityMargin[Us] += mg_value(v); + ei.value -= Sign[Us] * SafetyTable[Us][attackUnits]; + ei.futilityMargin[Us] += mg_value(SafetyTable[Us][attackUnits]); } } - // evaluate_passed_pawns_of_color() evaluates the passed pawns of the given color + // evaluate_passed_pawns<>() evaluates the passed pawns of the given color template - void evaluate_passed_pawns_of_color(const Position& pos, int movesToGo[], Square pawnToGo[], EvalInfo& ei) { + void evaluate_passed_pawns(const Position& pos, EvalInfo& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE); - Bitboard b2, b3, b4; - Square ourKingSq = pos.king_square(Us); - Square theirKingSq = pos.king_square(Them); - Bitboard b = ei.pi->passed_pawns() & pos.pieces(PAWN, Us); + Bitboard b = ei.pi->passed_pawns() & pos.pieces_of_color(Us); while (b) { @@ -901,23 +902,23 @@ namespace { { Square blockSq = s + pawn_push(Us); - ebonus -= Value(square_distance(ourKingSq, blockSq) * 3 * tr); - ebonus -= Value(square_distance(ourKingSq, blockSq + pawn_push(Us)) * 1 * tr); - ebonus += Value(square_distance(theirKingSq, blockSq) * 6 * tr); + ebonus -= Value(square_distance(pos.king_square(Us), blockSq) * 3 * tr); + ebonus -= Value(square_distance(pos.king_square(Us), blockSq + pawn_push(Us)) * 1 * tr); + ebonus += Value(square_distance(pos.king_square(Them), blockSq) * 6 * tr); // If the pawn is free to advance, increase bonus if (pos.square_is_empty(blockSq)) { // There are no enemy pawns in the pawn's path - b2 = squares_in_front_of(Us, s); + Bitboard b2 = squares_in_front_of(Us, s); assert((b2 & pos.pieces(PAWN, Them)) == EmptyBoardBB); // Squares attacked by us - b4 = b2 & ei.attacked_by(Us); + Bitboard b4 = b2 & ei.attacked_by(Us); // Squares attacked or occupied by enemy pieces - b3 = b2 & (ei.attacked_by(Them) | pos.pieces_of_color(Them)); + Bitboard b3 = b2 & (ei.attacked_by(Them) | pos.pieces_of_color(Them)); // If there is an enemy rook or queen attacking the pawn from behind, // add all X-ray attacks by the rook or queen. @@ -945,38 +946,12 @@ namespace { } // tr != 0 // If the pawn is supported by a friendly pawn, increase bonus - b2 = pos.pieces(PAWN, Us) & neighboring_files_bb(s); - if (b2 & rank_bb(s)) + Bitboard b1 = pos.pieces(PAWN, Us) & neighboring_files_bb(s); + if (b1 & rank_bb(s)) ebonus += Value(r * 20); - else if (pos.attacks_from(s, Them) & b2) + else if (pos.attacks_from(s, Them) & b1) ebonus += Value(r * 12); - // If the other side has only a king, check whether the pawn is - // unstoppable - if (pos.non_pawn_material(Them) == Value(0)) - { - Square qsq; - int d; - - qsq = relative_square(Us, make_square(square_file(s), RANK_8)); - d = square_distance(s, qsq) - - square_distance(theirKingSq, qsq) - + int(Us != pos.side_to_move()); - - if (d < 0) - { - int mtg = RANK_8 - relative_rank(Us, s); - int blockerCount = count_1s_max_15(squares_in_front_of(Us,s) & pos.occupied_squares()); - mtg += blockerCount; - d += blockerCount; - if (d < 0 && (!movesToGo[Us] || movesToGo[Us] > mtg)) - { - movesToGo[Us] = mtg; - pawnToGo[Us] = s; - } - } - } - // Rook pawns are a special case: They are sometimes worse, and // sometimes better than other passed pawns. It is difficult to find // good rules for determining whether they are good or bad. For now, @@ -999,16 +974,43 @@ namespace { } - // evaluate_passed_pawns() evaluates the passed pawns for both sides + // evaluate_unstoppable_pawns() evaluates the unstoppable passed pawns for both sides - void evaluate_passed_pawns(const Position& pos, EvalInfo& ei) { + void evaluate_unstoppable_pawns(const Position& pos, EvalInfo& ei) { int movesToGo[2] = {0, 0}; Square pawnToGo[2] = {SQ_NONE, SQ_NONE}; - // Evaluate pawns for each color - evaluate_passed_pawns_of_color(pos, movesToGo, pawnToGo, ei); - evaluate_passed_pawns_of_color(pos, movesToGo, pawnToGo, ei); + for (Color c = WHITE; c <= BLACK; c++) + { + // Skip evaluation if other side has non-pawn pieces + if (pos.non_pawn_material(opposite_color(c))) + continue; + + Bitboard b = ei.pi->passed_pawns() & pos.pieces_of_color(c); + + while (b) + { + Square s = pop_1st_bit(&b); + Square queeningSquare = relative_square(c, make_square(square_file(s), RANK_8)); + int d = square_distance(s, queeningSquare) + - square_distance(pos.king_square(opposite_color(c)), queeningSquare) + + int(c != pos.side_to_move()); + + if (d < 0) + { + int mtg = RANK_8 - relative_rank(c, s); + int blockerCount = count_1s_max_15(squares_in_front_of(c, s) & pos.occupied_squares()); + mtg += blockerCount; + d += blockerCount; + if (d < 0 && (!movesToGo[c] || movesToGo[c] > mtg)) + { + movesToGo[c] = mtg; + pawnToGo[c] = s; + } + } + } + } // Neither side has an unstoppable passed pawn? if (!(movesToGo[WHITE] | movesToGo[BLACK])) @@ -1200,7 +1202,7 @@ namespace { } // init_safety() initizes the king safety evaluation, based on UCI - // parameters. It is called from read_weights(). + // parameters. It is called from read_weights(). void init_safety() { @@ -1208,22 +1210,29 @@ namespace { int peak = 0x500; double a = 0.4; double b = 0.0; + Value t[100]; + // First setup the base table for (int i = 0; i < 100; i++) { if (i < b) - SafetyTable[i] = Value(0); + t[i] = Value(0); else - SafetyTable[i] = Value((int)(a * (i - b) * (i - b))); + t[i] = Value((int)(a * (i - b) * (i - b))); } for (int i = 1; i < 100; i++) { - if (SafetyTable[i] - SafetyTable[i - 1] > maxSlope) - SafetyTable[i] = SafetyTable[i - 1] + Value(maxSlope); + if (t[i] - t[i - 1] > maxSlope) + t[i] = t[i - 1] + Value(maxSlope); - if (SafetyTable[i] > Value(peak)) - SafetyTable[i] = Value(peak); + if (t[i] > Value(peak)) + t[i] = Value(peak); } + + // Then apply the weights and get the final SafetyTable[] array + for (Color c = WHITE; c <= BLACK; c++) + for (int i = 0; i < 100; i++) + SafetyTable[c][i] = apply_weight(make_score(t[i], 0), WeightKingSafety[c]); } }