X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=5f86227c2c5e9718e4ec76a967638167054ebff0;hp=1e8dae9585026ab8cda57e5f6e7834af57b965d4;hb=6b7efa0cd14b73416c9030462f79a02bbfc7ad2c;hpb=71e852ea815be8dd718685cb9e15ccdb8b756211 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 1e8dae95..5f86227c 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2009 Marco Costalba + Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -64,8 +64,7 @@ namespace { const Score WeightKingOppSafetyInternal = make_score(259, 0); // Mobility and outposts bonus modified by Joona Kiiski - // - // Visually better to define tables constants + typedef Value V; #define S(mg, eg) make_score(mg, eg) @@ -111,7 +110,7 @@ namespace { // Pointers table to access mobility tables through piece type const Score* MobilityBonus[8] = { 0, 0, KnightMobilityBonus, BishopMobilityBonus, - RookMobilityBonus, QueenMobilityBonus, 0, 0 }; + RookMobilityBonus, QueenMobilityBonus, 0, 0 }; // Outpost bonuses for knights and bishops, indexed by square (from white's // point of view). @@ -141,7 +140,7 @@ namespace { // ThreatBonus[][] contains bonus according to which piece type // attacks which one. - #define Z make_score(0, 0) + #define Z S(0, 0) const Score ThreatBonus[8][8] = { { Z, Z, Z, Z, Z, Z, Z, Z }, // not used @@ -225,15 +224,19 @@ namespace { const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight }; - // Bonuses for safe checks, initialized from UCI options - int QueenContactCheckBonus, DiscoveredCheckBonus; - int QueenCheckBonus, RookCheckBonus, BishopCheckBonus, KnightCheckBonus; + // Bonuses for safe checks + const int QueenContactCheckBonus = 3; + const int DiscoveredCheckBonus = 3; + const int QueenCheckBonus = 2; + const int RookCheckBonus = 1; + const int BishopCheckBonus = 1; + const int KnightCheckBonus = 1; // Scan for queen contact mates? const bool QueenContactMates = true; - // Bonus for having a mate threat, initialized from UCI options - int MateThreatBonus; + // Bonus for having a mate threat + const int MateThreatBonus = 3; // InitKingDanger[] contains bonuses based on the position of the defending // king. @@ -252,9 +255,10 @@ namespace { // in init_safety(). Value SafetyTable[100]; - // Pawn and material hash tables, indexed by the current thread id - PawnInfoTable* PawnTable[8] = {0, 0, 0, 0, 0, 0, 0, 0}; - MaterialInfoTable* MaterialTable[8] = {0, 0, 0, 0, 0, 0, 0, 0}; + // Pawn and material hash tables, indexed by the current thread id. + // Note that they will be initialized at 0 being global variables. + MaterialInfoTable* MaterialTable[MAX_THREADS]; + PawnInfoTable* PawnTable[MAX_THREADS]; // Sizes of pawn and material hash tables const int PawnTableSize = 16384; @@ -305,7 +309,7 @@ template Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { assert(pos.is_ok()); - assert(threadID >= 0 && threadID < THREAD_MAX); + assert(threadID >= 0 && threadID < MAX_THREADS); assert(!pos.is_check()); memset(&ei, 0, sizeof(EvalInfo)); @@ -330,7 +334,7 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { // Probe the pawn hash table ei.pi = PawnTable[threadID]->get_pawn_info(pos); - ei.value += apply_weight(ei.pi->value(), WeightPawnStructure); + ei.value += apply_weight(ei.pi->pawns_value(), WeightPawnStructure); // Initialize king attack bitboards and king attack zones for both sides ei.attackedBy[WHITE][KING] = pos.attacks_from(pos.king_square(WHITE)); @@ -426,6 +430,13 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { factor[BLACK] = sf; } + // If we don't already have an unusual scale factor, use pawn + // evaluation ones. + if (factor[WHITE] == SCALE_FACTOR_NORMAL) + factor[WHITE] = ei.pi->scale_factor(WHITE); + if (factor[BLACK] == SCALE_FACTOR_NORMAL) + factor[BLACK] = ei.pi->scale_factor(BLACK); + // Interpolate between the middle game and the endgame score Color stm = pos.side_to_move(); @@ -436,28 +447,13 @@ Value do_evaluate(const Position& pos, EvalInfo& ei, int threadID) { } // namespace -/// quick_evaluate() does a very approximate evaluation of the current position. -/// It currently considers only material and piece square table scores. Perhaps -/// we should add scores from the pawn and material hash tables? - -Value quick_evaluate(const Position &pos) { - - assert(pos.is_ok()); - - static const ScaleFactor sf[2] = {SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL}; - - Value v = scale_by_game_phase(pos.value(), MaterialInfoTable::game_phase(pos), sf); - return (pos.side_to_move() == WHITE ? v : -v); -} - - /// init_eval() initializes various tables used by the evaluation function void init_eval(int threads) { - assert(threads <= THREAD_MAX); + assert(threads <= MAX_THREADS); - for (int i = 0; i < THREAD_MAX; i++) + for (int i = 0; i < MAX_THREADS; i++) { if (i >= threads) { @@ -479,7 +475,7 @@ void init_eval(int threads) { void quit_eval() { - for (int i = 0; i < THREAD_MAX; i++) + for (int i = 0; i < MAX_THREADS; i++) { delete PawnTable[i]; delete MaterialTable[i]; @@ -875,16 +871,13 @@ namespace { // 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; - - if (Us == pos.side_to_move()) - ei.futilityMargin += mg_value(v); + ei.futilityMargin[Us] += mg_value(v); } } - // evaluate_passed_pawns() evaluates the passed pawns of the given color + // evaluate_passed_pawns_of_color() evaluates the passed pawns of the given color template void evaluate_passed_pawns_of_color(const Position& pos, int movesToGo[], Square pawnToGo[], EvalInfo& ei) { @@ -975,7 +968,7 @@ namespace { qsq = relative_square(Us, make_square(square_file(s), RANK_8)); d = square_distance(s, qsq) - square_distance(theirKingSq, qsq) - + (Us != pos.side_to_move()); + + int(Us != pos.side_to_move()); if (d < 0) { @@ -1218,36 +1211,23 @@ namespace { void init_safety() { - QueenContactCheckBonus = get_option_value_int("Queen Contact Check Bonus"); - QueenCheckBonus = get_option_value_int("Queen Check Bonus"); - RookCheckBonus = get_option_value_int("Rook Check Bonus"); - BishopCheckBonus = get_option_value_int("Bishop Check Bonus"); - KnightCheckBonus = get_option_value_int("Knight Check Bonus"); - DiscoveredCheckBonus = get_option_value_int("Discovered Check Bonus"); - MateThreatBonus = get_option_value_int("Mate Threat Bonus"); - - int maxSlope = get_option_value_int("King Safety Max Slope"); - int peak = get_option_value_int("King Safety Max Value") * 256 / 100; - double a = get_option_value_int("King Safety Coefficient") / 100.0; - double b = get_option_value_int("King Safety X Intercept"); - bool quad = (get_option_value_string("King Safety Curve") == "Quadratic"); - bool linear = (get_option_value_string("King Safety Curve") == "Linear"); + int maxSlope = 30; + int peak = 0x500; + double a = 0.4; + double b = 0.0; for (int i = 0; i < 100; i++) { if (i < b) SafetyTable[i] = Value(0); - else if (quad) + else SafetyTable[i] = Value((int)(a * (i - b) * (i - b))); - else if (linear) - SafetyTable[i] = Value((int)(100 * a * (i - b))); } - for (int i = 0; i < 100; i++) + for (int i = 1; i < 100; i++) { - if (SafetyTable[i+1] - SafetyTable[i] > maxSlope) - for (int j = i + 1; j < 100; j++) - SafetyTable[j] = SafetyTable[j-1] + Value(maxSlope); + if (SafetyTable[i] - SafetyTable[i - 1] > maxSlope) + SafetyTable[i] = SafetyTable[i - 1] + Value(maxSlope); if (SafetyTable[i] > Value(peak)) SafetyTable[i] = Value(peak);