X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=73ffcfb053057a6a203674dff264702940f55110;hp=0153fa95a41c613cba09a4ff5521dc834da5227d;hb=a98dee783582c84ca2647ca28daad0c9a13d1d35;hpb=66b751713e1785cc4ae1779318ae2fdafa734add diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 0153fa95..73ffcfb0 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -29,7 +29,6 @@ #include "evaluate.h" #include "material.h" #include "pawns.h" -#include "scale.h" #include "thread.h" #include "ucioption.h" @@ -148,10 +147,6 @@ namespace { #undef S - // Threats weights indexed by sente (side to move has a bigger weight) - const int ConcurrentThreatsWeight[2] = { 3, 15 }; - const int ThreatsWeight[2] = { 249, 267 }; - // Bonus for unstoppable passed pawns const Value UnstoppablePawnValue = Value(0x500); @@ -211,7 +206,6 @@ namespace { // Bonuses for enemy's safe checks const int QueenContactCheckBonus = 3; - const int DiscoveredCheckBonus = 3; const int QueenCheckBonus = 2; const int RookCheckBonus = 1; const int BishopCheckBonus = 1; @@ -244,7 +238,7 @@ namespace { // Function prototypes template - Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID); + Value do_evaluate(const Position& pos, EvalInfo& ei); template void init_attack_tables(const Position& pos, EvalInfo& ei); @@ -259,7 +253,7 @@ namespace { void evaluate_threats(const Position& pos, EvalInfo& ei); template - void evaluate_space(const Position& pos, EvalInfo& ei); + int evaluate_space(const Position& pos, EvalInfo& ei); template void evaluate_passed_pawns(const Position& pos, EvalInfo& ei); @@ -281,21 +275,21 @@ namespace { /// evaluate() is the main evaluation function. It always computes two /// values, an endgame score and a middle game score, and interpolates /// between them based on the remaining material. -Value evaluate(const Position& pos, EvalInfo& ei, int threadID) { +Value evaluate(const Position& pos, EvalInfo& ei) { - return CpuHasPOPCNT ? do_evaluate(pos, ei, threadID) - : do_evaluate(pos, ei, threadID); + return CpuHasPOPCNT ? do_evaluate(pos, ei) + : do_evaluate(pos, ei); } namespace { template -Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { +Value do_evaluate(const Position& pos, EvalInfo& ei) { ScaleFactor factor[2]; assert(pos.is_ok()); - assert(threadID >= 0 && threadID < MAX_THREADS); + assert(pos.thread() >= 0 && pos.thread() < MAX_THREADS); assert(!pos.is_check()); memset(&ei, 0, sizeof(EvalInfo)); @@ -305,7 +299,7 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { ei.value = pos.value(); // Probe the material hash table - ei.mi = MaterialTable[threadID]->get_material_info(pos); + ei.mi = MaterialTable[pos.thread()]->get_material_info(pos); ei.value += ei.mi->material_value(); // If we have a specialized evaluation function for the current material @@ -318,7 +312,7 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { factor[BLACK] = ei.mi->scale_factor(pos, BLACK); // Probe the pawn hash table - ei.pi = PawnTable[threadID]->get_pawn_info(pos); + ei.pi = PawnTable[pos.thread()]->get_pawn_info(pos); ei.value += apply_weight(ei.pi->pawns_value(), Weights[PawnStructure]); // Initialize attack bitboards with pawns evaluation @@ -366,8 +360,8 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { // Evaluate space for both sides if (ei.mi->space_weight() > 0) { - evaluate_space(pos, ei); - evaluate_space(pos, ei); + int s = evaluate_space(pos, ei) - evaluate_space(pos, ei); + ei.value += apply_weight(make_score(s * ei.mi->space_weight(), 0), Weights[Space]); } } @@ -474,7 +468,7 @@ void read_weights(Color us) { namespace { - // init_king_tables() initializes king bitboards for both sides adding + // init_attack_tables() initializes king bitboards for both sides adding // pawn attacks. To be done before other evaluations. template @@ -640,8 +634,6 @@ namespace { const Color Them = (Us == WHITE ? BLACK : WHITE); Bitboard b; - Value mg, eg; - int sente, threatCount = 0; Score bonus = make_score(0, 0); // Enemy pieces not defended by a pawn and under our attack @@ -660,20 +652,9 @@ namespace { if (b) for (PieceType pt2 = PAWN; pt2 < KING; pt2++) if (b & pos.pieces(pt2)) - { bonus += ThreatBonus[pt1][pt2]; - threatCount++; - } } - - sente = (Us == pos.side_to_move()); - - // Non linear threat evaluation. Increase threats score according to the - // number of concurrent threats and to the side to move. - mg = (mg_value(bonus) + mg_value(bonus) * ConcurrentThreatsWeight[sente] * threatCount / 256) * ThreatsWeight[sente] / 256; - eg = (eg_value(bonus) + eg_value(bonus) * ConcurrentThreatsWeight[sente] * threatCount / 256) * ThreatsWeight[sente] / 256; - - ei.value += Sign[Us] * make_score(mg, eg); + ei.value += Sign[Us] * bonus; } @@ -812,7 +793,6 @@ namespace { { Square s = pop_1st_bit(&b); - assert(pos.piece_on(s) == piece_of_color_and_type(Us, PAWN)); assert(pos.pawn_is_passed(Us, s)); int r = int(relative_rank(Us, s) - RANK_2); @@ -880,8 +860,7 @@ namespace { // value if the other side has a rook or queen. if (square_file(s) == FILE_A || square_file(s) == FILE_H) { - if ( pos.non_pawn_material(Them) <= KnightValueMidgame - && pos.piece_count(Them, KNIGHT) <= 1) + if (pos.non_pawn_material(Them) <= KnightValueMidgame) ebonus += ebonus / 4; else if (pos.pieces(ROOK, QUEEN, Them)) ebonus -= ebonus / 4; @@ -914,16 +893,20 @@ namespace { Square s = pop_1st_bit(&b); Square queeningSquare = relative_square(c, make_square(square_file(s), RANK_8)); int d = square_distance(s, queeningSquare) + - int(relative_rank(c, s) == RANK_2) // Double pawn push - square_distance(pos.king_square(opposite_color(c)), queeningSquare) + int(c != pos.side_to_move()); - if (d < 0) + // Do we protect the path to queening ? + bool pathDefended = (ei.attacked_by(c) & squares_in_front_of(c, s)) == squares_in_front_of(c, s); + + if (d < 0 || pathDefended) { 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)) + if ((d < 0 || pathDefended) && (!movesToGo[c] || movesToGo[c] > mtg)) { movesToGo[c] = mtg; pawnToGo[c] = s; @@ -1053,27 +1036,24 @@ namespace { // twice. Finally, the space bonus is scaled by a weight taken from the // material hash table. template - void evaluate_space(const Position& pos, EvalInfo& ei) { + int evaluate_space(const Position& pos, EvalInfo& ei) { const Color Them = (Us == WHITE ? BLACK : WHITE); // Find the safe squares for our pieces inside the area defined by // SpaceMask[us]. A square is unsafe if it is attacked by an enemy // pawn, or if it is undefended and attacked by an enemy piece. - Bitboard safeSquares = SpaceMask[Us] - & ~pos.pieces(PAWN, Us) - & ~ei.attacked_by(Them, PAWN) - & (ei.attacked_by(Us) | ~ei.attacked_by(Them)); + Bitboard safe = SpaceMask[Us] + & ~pos.pieces(PAWN, Us) + & ~ei.attacked_by(Them, PAWN) + & (ei.attacked_by(Us) | ~ei.attacked_by(Them)); // Find all squares which are at most three squares behind some friendly pawn - Bitboard behindFriendlyPawns = pos.pieces(PAWN, Us); - behindFriendlyPawns |= (Us == WHITE ? behindFriendlyPawns >> 8 : behindFriendlyPawns << 8); - behindFriendlyPawns |= (Us == WHITE ? behindFriendlyPawns >> 16 : behindFriendlyPawns << 16); - - int space = count_1s_max_15(safeSquares) - + count_1s_max_15(behindFriendlyPawns & safeSquares); + Bitboard behind = pos.pieces(PAWN, Us); + behind |= (Us == WHITE ? behind >> 8 : behind << 8); + behind |= (Us == WHITE ? behind >> 16 : behind << 16); - ei.value += Sign[Us] * apply_weight(make_score(space * ei.mi->space_weight(), 0), Weights[Space]); + return count_1s_max_15(safe) + count_1s_max_15(behind & safe); } @@ -1094,7 +1074,9 @@ namespace { assert(eg_value(v) > -VALUE_INFINITE && eg_value(v) < VALUE_INFINITE); assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME); - Value ev = apply_scale_factor(eg_value(v), sf[(eg_value(v) > Value(0) ? WHITE : BLACK)]); + Value eg = eg_value(v); + ScaleFactor f = sf[eg > Value(0) ? WHITE : BLACK]; + Value ev = Value((eg * f) / int(SCALE_FACTOR_NORMAL)); int result = (mg_value(v) * ph + ev * (128 - ph)) / 128; return Value(result & ~(GrainSize - 1));