X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=b9b4bb63988ec28f6425592b937d8118b6ce2205;hp=796153e853719a3deef1063c906e675e35fe8f5c;hb=52ae0efccffcce7f095cc4bae7bf90fe7a3b467b;hpb=c88eebc98905b47077ef2b35b35ea5705d448d4f diff --git a/src/material.cpp b/src/material.cpp index 796153e8..b9b4bb63 100644 --- a/src/material.cpp +++ b/src/material.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-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 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 @@ -17,9 +17,9 @@ along with this program. If not, see . */ +#include // For std::min #include #include -#include #include "material.h" @@ -31,150 +31,157 @@ namespace { const Value MidgameLimit = Value(15581); const Value EndgameLimit = Value(3998); - // Polynomial material balance parameters - const Value RedundantQueenPenalty = Value(320); - const Value RedundantRookPenalty = Value(554); - - const int LinearCoefficients[6] = { 1617, -162, -1172, -190, 105, 26 }; - - const int QuadraticCoefficientsSameColor[][8] = { - { 7, 7, 7, 7, 7, 7 }, { 39, 2, 7, 7, 7, 7 }, { 35, 271, -4, 7, 7, 7 }, - { 7, 25, 4, 7, 7, 7 }, { -27, -2, 46, 100, 56, 7 }, { 58, 29, 83, 148, -3, -25 } }; - - const int QuadraticCoefficientsOppositeColor[][8] = { - { 41, 41, 41, 41, 41, 41 }, { 37, 41, 41, 41, 41, 41 }, { 10, 62, 41, 41, 41, 41 }, - { 57, 64, 39, 41, 41, 41 }, { 50, 40, 23, -22, 41, 41 }, { 106, 101, 3, 151, 171, 41 } }; + // Scale factors used when one side has no more pawns + const int NoPawnsSF[4] = { 6, 12, 32 }; - typedef EndgameEvaluationFunctionBase EF; - typedef EndgameScalingFunctionBase SF; - typedef map EFMap; - typedef map SFMap; + // Polynomial material balance parameters + const Value RedundantMajor = Value(160); + + // pair pawn knight bishop rook queen + const int LinearCoefficients[6] = { 1852, -162, -1122, -183, 302, 1 }; + + const int QuadraticCoefficientsSameColor[][PIECE_TYPE_NB] = { + // pair pawn knight bishop rook queen + { 0 }, // Bishop pair + { 39, 2 }, // Pawn + { 35, 271, -4 }, // Knight + { 0, 105, 4, 0 }, // Bishop + { -27, -2, 46, 100, -141 }, // Rook + { 58, 29, 83, 148, -163, 0 } // Queen + }; + + const int QuadraticCoefficientsOppositeColor[][PIECE_TYPE_NB] = { + // THEIR PIECES + // pair pawn knight bishop rook queen + { 0 }, // Bishop pair + { 37, 0 }, // Pawn + { 10, 62, 0 }, // Knight OUR PIECES + { 57, 64, 39, 0 }, // Bishop + { 50, 40, 23, -22, 0 }, // Rook + { 106, 101, 3, 151, 171, 0 } // Queen + }; // Endgame evaluation and scaling functions accessed direcly and not through // the function maps because correspond to more then one material hash key. - EvaluationFunction EvaluateKmmKm[] = { EvaluationFunction(WHITE), EvaluationFunction(BLACK) }; - EvaluationFunction EvaluateKXK[] = { EvaluationFunction(WHITE), EvaluationFunction(BLACK) }; - ScalingFunction ScaleKBPsK[] = { ScalingFunction(WHITE), ScalingFunction(BLACK) }; - ScalingFunction ScaleKQKRPs[] = { ScalingFunction(WHITE), ScalingFunction(BLACK) }; - ScalingFunction ScaleKPsK[] = { ScalingFunction(WHITE), ScalingFunction(BLACK) }; - ScalingFunction ScaleKPKP[] = { ScalingFunction(WHITE), ScalingFunction(BLACK) }; + Endgame EvaluateKmmKm[] = { Endgame(WHITE), Endgame(BLACK) }; + Endgame EvaluateKXK[] = { Endgame(WHITE), Endgame(BLACK) }; + + Endgame ScaleKBPsK[] = { Endgame(WHITE), Endgame(BLACK) }; + Endgame ScaleKQKRPs[] = { Endgame(WHITE), Endgame(BLACK) }; + Endgame ScaleKPsK[] = { Endgame(WHITE), Endgame(BLACK) }; + Endgame ScaleKPKP[] = { Endgame(WHITE), Endgame(BLACK) }; // Helper templates used to detect a given material distribution template bool is_KXK(const Position& pos) { const Color Them = (Us == WHITE ? BLACK : WHITE); - return pos.non_pawn_material(Them) == VALUE_ZERO - && pos.piece_count(Them, PAWN) == 0 - && pos.non_pawn_material(Us) >= RookValueMidgame; + return !pos.count(Them) + && pos.non_pawn_material(Them) == VALUE_ZERO + && pos.non_pawn_material(Us) >= RookValueMg; } template bool is_KBPsKs(const Position& pos) { - return pos.non_pawn_material(Us) == BishopValueMidgame - && pos.piece_count(Us, BISHOP) == 1 - && pos.piece_count(Us, PAWN) >= 1; + return pos.non_pawn_material(Us) == BishopValueMg + && pos.count(Us) == 1 + && pos.count(Us) >= 1; } template bool is_KQKRPs(const Position& pos) { const Color Them = (Us == WHITE ? BLACK : WHITE); - return pos.piece_count(Us, PAWN) == 0 - && pos.non_pawn_material(Us) == QueenValueMidgame - && pos.piece_count(Us, QUEEN) == 1 - && pos.piece_count(Them, ROOK) == 1 - && pos.piece_count(Them, PAWN) >= 1; + return !pos.count(Us) + && pos.non_pawn_material(Us) == QueenValueMg + && pos.count(Us) == 1 + && pos.count(Them) == 1 + && pos.count(Them) >= 1; } -} - -/// EndgameFunctions class stores endgame evaluation and scaling functions -/// in two std::map. Because STL library is not guaranteed to be thread -/// safe even for read access, the maps, although with identical content, -/// are replicated for each thread. This is faster then using locks. + /// imbalance() calculates imbalance comparing piece count of each + /// piece type for both colors. -class EndgameFunctions { -public: - EndgameFunctions(); - ~EndgameFunctions(); - template T* get(Key key) const; + template + int imbalance(const int pieceCount[][PIECE_TYPE_NB]) { -private: - template void add(const string& keyCode); + const Color Them = (Us == WHITE ? BLACK : WHITE); - static Key buildKey(const string& keyCode); - static const string swapColors(const string& keyCode); + int pt1, pt2, pc, v; + int value = 0; - // Here we store two maps, for evaluate and scaling functions... - pair maps; + // Penalty for major piece redundancy + if (pieceCount[Us][ROOK] + pieceCount[Us][QUEEN] > 1) + value -= RedundantMajor; - // ...and here is the accessing template function - template const map& get() const; -}; + // Second-degree polynomial material imbalance by Tord Romstad + for (pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; ++pt1) + { + pc = pieceCount[Us][pt1]; + if (!pc) + continue; -// Explicit specializations of a member function shall be declared in -// the namespace of which the class template is a member. -template<> const EFMap& EndgameFunctions::get() const { return maps.first; } -template<> const SFMap& EndgameFunctions::get() const { return maps.second; } + v = LinearCoefficients[pt1]; + for (pt2 = NO_PIECE_TYPE; pt2 <= pt1; ++pt2) + v += QuadraticCoefficientsSameColor[pt1][pt2] * pieceCount[Us][pt2] + + QuadraticCoefficientsOppositeColor[pt1][pt2] * pieceCount[Them][pt2]; -/// MaterialInfoTable c'tor and d'tor allocate and free the space for EndgameFunctions + value += pc * v; + } + return value; + } -MaterialInfoTable::MaterialInfoTable() { funcs = new EndgameFunctions(); } -MaterialInfoTable::~MaterialInfoTable() { delete funcs; } +} // namespace +namespace Material { -/// MaterialInfoTable::get_material_info() takes a position object as input, -/// computes or looks up a MaterialInfo object, and returns a pointer to it. -/// If the material configuration is not already present in the table, it -/// is stored there, so we don't have to recompute everything when the -/// same material configuration occurs again. +/// Material::probe() takes a position object as input, looks up a MaterialEntry +/// object, and returns a pointer to it. If the material configuration is not +/// already present in the table, it is computed and stored there, so we don't +/// have to recompute everything when the same material configuration occurs again. -MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) const { +Entry* probe(const Position& pos, Table& entries, Endgames& endgames) { - Key key = pos.get_material_key(); - MaterialInfo* mi = find(key); + Key key = pos.material_key(); + Entry* e = entries[key]; - // If mi->key matches the position's material hash key, it means that we + // If e->key matches the position's material hash key, it means that we // have analysed this material configuration before, and we can simply // return the information we found the last time instead of recomputing it. - if (mi->key == key) - return mi; + if (e->key == key) + return e; - // Initialize MaterialInfo entry - memset(mi, 0, sizeof(MaterialInfo)); - mi->key = key; - mi->factor[WHITE] = mi->factor[BLACK] = (uint8_t)SCALE_FACTOR_NORMAL; - - // Store game phase - mi->gamePhase = MaterialInfoTable::game_phase(pos); + std::memset(e, 0, sizeof(Entry)); + e->key = key; + e->factor[WHITE] = e->factor[BLACK] = (uint8_t)SCALE_FACTOR_NORMAL; + e->gamePhase = game_phase(pos); // Let's look if we have a specialized evaluation function for this // particular material configuration. First we look for a fixed // configuration one, then a generic one if previous search failed. - if ((mi->evaluationFunction = funcs->get(key)) != NULL) - return mi; + if (endgames.probe(key, e->evaluationFunction)) + return e; if (is_KXK(pos)) { - mi->evaluationFunction = &EvaluateKXK[WHITE]; - return mi; + e->evaluationFunction = &EvaluateKXK[WHITE]; + return e; } if (is_KXK(pos)) { - mi->evaluationFunction = &EvaluateKXK[BLACK]; - return mi; + e->evaluationFunction = &EvaluateKXK[BLACK]; + return e; } if (!pos.pieces(PAWN) && !pos.pieces(ROOK) && !pos.pieces(QUEEN)) { // Minor piece endgame with at least one minor piece per side and // no pawns. Note that the case KmmK is already handled by KXK. - assert((pos.pieces(KNIGHT, WHITE) | pos.pieces(BISHOP, WHITE))); - assert((pos.pieces(KNIGHT, BLACK) | pos.pieces(BISHOP, BLACK))); + assert((pos.pieces(WHITE, KNIGHT) | pos.pieces(WHITE, BISHOP))); + assert((pos.pieces(BLACK, KNIGHT) | pos.pieces(BLACK, BISHOP))); - if ( pos.piece_count(WHITE, BISHOP) + pos.piece_count(WHITE, KNIGHT) <= 2 - && pos.piece_count(BLACK, BISHOP) + pos.piece_count(BLACK, KNIGHT) <= 2) + if ( pos.count(WHITE) + pos.count(WHITE) <= 2 + && pos.count(BLACK) + pos.count(BLACK) <= 2) { - mi->evaluationFunction = &EvaluateKmmKm[WHITE]; - return mi; + e->evaluationFunction = &EvaluateKmmKm[pos.side_to_move()]; + return e; } } @@ -183,226 +190,101 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) const { // // We face problems when there are several conflicting applicable // scaling functions and we need to decide which one to use. - SF* sf; + EndgameBase* sf; - if ((sf = funcs->get(key)) != NULL) + if (endgames.probe(key, sf)) { - mi->scalingFunction[sf->color()] = sf; - return mi; + e->scalingFunction[sf->color()] = sf; + return e; } // Generic scaling functions that refer to more then one material // distribution. Should be probed after the specialized ones. // Note that these ones don't return after setting the function. if (is_KBPsKs(pos)) - mi->scalingFunction[WHITE] = &ScaleKBPsK[WHITE]; + e->scalingFunction[WHITE] = &ScaleKBPsK[WHITE]; if (is_KBPsKs(pos)) - mi->scalingFunction[BLACK] = &ScaleKBPsK[BLACK]; + e->scalingFunction[BLACK] = &ScaleKBPsK[BLACK]; if (is_KQKRPs(pos)) - mi->scalingFunction[WHITE] = &ScaleKQKRPs[WHITE]; + e->scalingFunction[WHITE] = &ScaleKQKRPs[WHITE]; else if (is_KQKRPs(pos)) - mi->scalingFunction[BLACK] = &ScaleKQKRPs[BLACK]; + e->scalingFunction[BLACK] = &ScaleKQKRPs[BLACK]; + + Value npm_w = pos.non_pawn_material(WHITE); + Value npm_b = pos.non_pawn_material(BLACK); - if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == VALUE_ZERO) + if (npm_w + npm_b == VALUE_ZERO) { - if (pos.piece_count(BLACK, PAWN) == 0) + if (!pos.count(BLACK)) { - assert(pos.piece_count(WHITE, PAWN) >= 2); - mi->scalingFunction[WHITE] = &ScaleKPsK[WHITE]; + assert(pos.count(WHITE) >= 2); + e->scalingFunction[WHITE] = &ScaleKPsK[WHITE]; } - else if (pos.piece_count(WHITE, PAWN) == 0) + else if (!pos.count(WHITE)) { - assert(pos.piece_count(BLACK, PAWN) >= 2); - mi->scalingFunction[BLACK] = &ScaleKPsK[BLACK]; + assert(pos.count(BLACK) >= 2); + e->scalingFunction[BLACK] = &ScaleKPsK[BLACK]; } - else if (pos.piece_count(WHITE, PAWN) == 1 && pos.piece_count(BLACK, PAWN) == 1) + else if (pos.count(WHITE) == 1 && pos.count(BLACK) == 1) { // This is a special case because we set scaling functions // for both colors instead of only one. - mi->scalingFunction[WHITE] = &ScaleKPKP[WHITE]; - mi->scalingFunction[BLACK] = &ScaleKPKP[BLACK]; + e->scalingFunction[WHITE] = &ScaleKPKP[WHITE]; + e->scalingFunction[BLACK] = &ScaleKPKP[BLACK]; } } - // No pawns makes it difficult to win, even with a material advantage - for (Color c = WHITE; c <= BLACK; c++) - if ( pos.piece_count(c, PAWN) == 0 - && pos.non_pawn_material(c) - pos.non_pawn_material(opposite_color(c)) <= BishopValueMidgame) - { - if ( pos.non_pawn_material(c) == pos.non_pawn_material(opposite_color(c)) - || pos.non_pawn_material(c) < RookValueMidgame) - mi->factor[c] = 0; - else - { - switch (pos.piece_count(c, BISHOP)) { - case 2: - mi->factor[c] = 32; - break; - case 1: - mi->factor[c] = 12; - break; - case 0: - mi->factor[c] = 6; - break; - } - } - } + // No pawns makes it difficult to win, even with a material advantage. This + // catches some trivial draws like KK, KBK and KNK + if (!pos.count(WHITE) && npm_w - npm_b <= BishopValueMg) + { + e->factor[WHITE] = (uint8_t) + (npm_w == npm_b || npm_w < RookValueMg ? 0 : NoPawnsSF[std::min(pos.count(WHITE), 2)]); + } + + if (!pos.count(BLACK) && npm_b - npm_w <= BishopValueMg) + { + e->factor[BLACK] = (uint8_t) + (npm_w == npm_b || npm_b < RookValueMg ? 0 : NoPawnsSF[std::min(pos.count(BLACK), 2)]); + } // Compute the space weight - if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) >= - 2*QueenValueMidgame + 4*RookValueMidgame + 2*KnightValueMidgame) + if (npm_w + npm_b >= 2 * QueenValueMg + 4 * RookValueMg + 2 * KnightValueMg) { - int minorPieceCount = pos.piece_count(WHITE, KNIGHT) - + pos.piece_count(WHITE, BISHOP) - + pos.piece_count(BLACK, KNIGHT) - + pos.piece_count(BLACK, BISHOP); + int minorPieceCount = pos.count(WHITE) + pos.count(WHITE) + + pos.count(BLACK) + pos.count(BLACK); - mi->spaceWeight = minorPieceCount * minorPieceCount; + e->spaceWeight = make_score(minorPieceCount * minorPieceCount, 0); } // Evaluate the material imbalance. We use PIECE_TYPE_NONE as a place holder // for the bishop pair "extended piece", this allow us to be more flexible // in defining bishop pair bonuses. - const int pieceCount[2][8] = { - { pos.piece_count(WHITE, BISHOP) > 1, pos.piece_count(WHITE, PAWN), pos.piece_count(WHITE, KNIGHT), - pos.piece_count(WHITE, BISHOP), pos.piece_count(WHITE, ROOK), pos.piece_count(WHITE, QUEEN) }, - { pos.piece_count(BLACK, BISHOP) > 1, pos.piece_count(BLACK, PAWN), pos.piece_count(BLACK, KNIGHT), - pos.piece_count(BLACK, BISHOP), pos.piece_count(BLACK, ROOK), pos.piece_count(BLACK, QUEEN) } }; - - mi->value = (int16_t)(imbalance(pieceCount) - imbalance(pieceCount)) / 16; - return mi; + const int pieceCount[COLOR_NB][PIECE_TYPE_NB] = { + { pos.count(WHITE) > 1, pos.count(WHITE), pos.count(WHITE), + pos.count(WHITE) , pos.count(WHITE), pos.count(WHITE) }, + { pos.count(BLACK) > 1, pos.count(BLACK), pos.count(BLACK), + pos.count(BLACK) , pos.count(BLACK), pos.count(BLACK) } }; + + e->value = (int16_t)((imbalance(pieceCount) - imbalance(pieceCount)) / 16); + return e; } -/// MaterialInfoTable::imbalance() calculates imbalance comparing piece count of each -/// piece type for both colors. - -template -int MaterialInfoTable::imbalance(const int pieceCount[][8]) { - - const Color Them = (Us == WHITE ? BLACK : WHITE); - - int pt1, pt2, pc, vv; - int value = 0; - - // Redundancy of major pieces, formula based on Kaufman's paper - // "The Evaluation of Material Imbalances in Chess" - if (pieceCount[Us][ROOK] > 0) - value -= RedundantRookPenalty * (pieceCount[Us][ROOK] - 1) - + RedundantQueenPenalty * pieceCount[Us][QUEEN]; - - // Second-degree polynomial material imbalance by Tord Romstad - for (pt1 = PIECE_TYPE_NONE; pt1 <= QUEEN; pt1++) - { - pc = pieceCount[Us][pt1]; - if (!pc) - continue; - - vv = LinearCoefficients[pt1]; - - for (pt2 = PIECE_TYPE_NONE; pt2 <= pt1; pt2++) - vv += QuadraticCoefficientsSameColor[pt1][pt2] * pieceCount[Us][pt2] - + QuadraticCoefficientsOppositeColor[pt1][pt2] * pieceCount[Them][pt2]; - - value += pc * vv; - } - return value; -} - - -/// MaterialInfoTable::game_phase() calculates the phase given the current +/// Material::game_phase() calculates the phase given the current /// position. Because the phase is strictly a function of the material, it -/// is stored in MaterialInfo. +/// is stored in MaterialEntry. -Phase MaterialInfoTable::game_phase(const Position& pos) { +Phase game_phase(const Position& pos) { Value npm = pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK); - if (npm >= MidgameLimit) - return PHASE_MIDGAME; - - if (npm <= EndgameLimit) - return PHASE_ENDGAME; - - return Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit)); -} - - -/// EndgameFunctions member definitions - -EndgameFunctions::EndgameFunctions() { - - add >("KNNK"); - add >("KPK"); - add >("KBNK"); - add >("KRKP"); - add >("KRKB"); - add >("KRKN"); - add >("KQKR"); - add >("KBBKN"); - - add >("KNPK"); - add >("KRPKR"); - add >("KBPKB"); - add >("KBPPKB"); - add >("KBPKN"); - add >("KRPPKRP"); -} - -EndgameFunctions::~EndgameFunctions() { - - for (EFMap::const_iterator it = maps.first.begin(); it != maps.first.end(); ++it) - delete it->second; - - for (SFMap::const_iterator it = maps.second.begin(); it != maps.second.end(); ++it) - delete it->second; + return npm >= MidgameLimit ? PHASE_MIDGAME + : npm <= EndgameLimit ? PHASE_ENDGAME + : Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit)); } -Key EndgameFunctions::buildKey(const string& keyCode) { - - assert(keyCode.length() > 0 && keyCode.length() < 8); - assert(keyCode[0] == 'K'); - - string fen; - bool upcase = false; - - // Build up a fen string with the given pieces, note that - // the fen string could be of an illegal position. - for (size_t i = 0; i < keyCode.length(); i++) - { - if (keyCode[i] == 'K') - upcase = !upcase; - - fen += char(upcase ? toupper(keyCode[i]) : tolower(keyCode[i])); - } - fen += char(8 - keyCode.length() + '0'); - fen += "/8/8/8/8/8/8/8 w - -"; - return Position(fen, false, 0).get_material_key(); -} - -const string EndgameFunctions::swapColors(const string& keyCode) { - - // Build corresponding key for the opposite color: "KBPKN" -> "KNKBP" - size_t idx = keyCode.find('K', 1); - return keyCode.substr(idx) + keyCode.substr(0, idx); -} - -template -void EndgameFunctions::add(const string& keyCode) { - - typedef typename T::Base F; - typedef map M; - - const_cast(get()).insert(pair(buildKey(keyCode), new T(WHITE))); - const_cast(get()).insert(pair(buildKey(swapColors(keyCode)), new T(BLACK))); -} - -template -T* EndgameFunctions::get(Key key) const { - - typename map::const_iterator it = get().find(key); - return it != get().end() ? it->second : NULL; -} +} // namespace Material