X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=323611779963de5f62baf564e8ae98e920a9160b;hp=845bc90df6e0207deb5cf12c3007ed7a51064bd0;hb=b84af67f4c88f3e3f7b61bf2035475f79fb3e62e;hpb=67375f4693c97fb1321864bb4d143812cd824f9b diff --git a/src/material.cpp b/src/material.cpp index 845bc90d..32361177 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 Marco Costalba + Copyright (C) 2008-2012 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,367 +17,260 @@ along with this program. If not, see . */ - -//// -//// Includes -//// - +#include #include #include -#include #include "material.h" - -//// -//// Local definitions -//// +using namespace std; namespace { - const Value BishopPairMidgameBonus = Value(100); - const Value BishopPairEndgameBonus = Value(100); - - Key KNNKMaterialKey, KKNNMaterialKey; - -} - -//// -//// Classes -//// + // Values modified by Joona Kiiski + const Value MidgameLimit = Value(15581); + const Value EndgameLimit = Value(3998); + // Scale factors used when one side has no more pawns + const int NoPawnsSF[4] = { 6, 12, 32 }; -/// See header for a class description. It is declared here to avoid -/// to include in the header file. - -class EndgameFunctions { - -public: - EndgameFunctions(); - EndgameEvaluationFunctionBase* getEEF(Key key) const; - EndgameScalingFunctionBase* getESF(Key key, Color* c) const; - -private: - void add(Key k, EndgameEvaluationFunctionBase* f); - void add(Key k, Color c, EndgameScalingFunctionBase* f); - - struct ScalingInfo - { - Color col; - EndgameScalingFunctionBase* fun; - }; - - std::map EEFmap; - std::map ESFmap; -}; + // Polynomial material balance parameters + const Value RedundantQueenPenalty = Value(320); + const Value RedundantRookPenalty = Value(554); + const int LinearCoefficients[6] = { 1617, -162, -1172, -190, 105, 26 }; -//// -//// Functions -//// + 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 } }; -/// Constructor for the MaterialInfoTable class + // Endgame evaluation and scaling functions accessed direcly and not through + // the function maps because correspond to more then one material hash key. + Endgame EvaluateKmmKm[] = { Endgame(WHITE), Endgame(BLACK) }; + Endgame EvaluateKXK[] = { Endgame(WHITE), Endgame(BLACK) }; -MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) { + Endgame ScaleKBPsK[] = { Endgame(WHITE), Endgame(BLACK) }; + Endgame ScaleKQKRPs[] = { Endgame(WHITE), Endgame(BLACK) }; + Endgame ScaleKPsK[] = { Endgame(WHITE), Endgame(BLACK) }; + Endgame ScaleKPKP[] = { Endgame(WHITE), Endgame(BLACK) }; - size = numOfEntries; - entries = new MaterialInfo[size]; - funcs = new EndgameFunctions(); - if (!entries || !funcs) - { - std::cerr << "Failed to allocate " << (numOfEntries * sizeof(MaterialInfo)) - << " bytes for material hash table." << std::endl; - exit(EXIT_FAILURE); + // 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) >= RookValueMg; } - clear(); -} - - -/// Destructor for the MaterialInfoTable class - -MaterialInfoTable::~MaterialInfoTable() { - - delete [] entries; - delete funcs; -} + template bool is_KBPsKs(const Position& pos) { + return pos.non_pawn_material(Us) == BishopValueMg + && pos.piece_count(Us, BISHOP) == 1 + && pos.piece_count(Us, PAWN) >= 1; + } -/// MaterialInfoTable::clear() clears a material hash table by setting -/// all entries to 0. - -void MaterialInfoTable::clear() { + 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) == QueenValueMg + && pos.piece_count(Us, QUEEN) == 1 + && pos.piece_count(Them, ROOK) == 1 + && pos.piece_count(Them, PAWN) >= 1; + } - memset(entries, 0, size * sizeof(MaterialInfo)); -} +} // namespace -/// 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. +/// MaterialTable::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) { +MaterialEntry* MaterialTable::probe(const Position& pos) { - Key key = pos.get_material_key(); - int index = key & (size - 1); - MaterialInfo* mi = entries + index; + Key key = pos.material_key(); + MaterialEntry* 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; - // Clear the MaterialInfo object, and set its key - mi->clear(); - mi->key = key; - - // A special case before looking for a specialized evaluation function - // KNN vs K is a draw. - if (key == KNNKMaterialKey || key == KKNNMaterialKey) - { - mi->factor[WHITE] = mi->factor[BLACK] = 0; - return mi; - } + memset(e, 0, sizeof(MaterialEntry)); + e->key = key; + e->factor[WHITE] = e->factor[BLACK] = (uint8_t)SCALE_FACTOR_NORMAL; + e->gamePhase = MaterialTable::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->getEEF(key)) != NULL) - return mi; + if (endgames.probe(key, e->evaluationFunction)) + return e; - else if ( pos.non_pawn_material(BLACK) == Value(0) - && pos.piece_count(BLACK, PAWN) == 0 - && pos.non_pawn_material(WHITE) >= RookValueEndgame) + if (is_KXK(pos)) { - mi->evaluationFunction = &EvaluateKXK; - return mi; + e->evaluationFunction = &EvaluateKXK[WHITE]; + return e; } - else if ( pos.non_pawn_material(WHITE) == Value(0) - && pos.piece_count(WHITE, PAWN) == 0 - && pos.non_pawn_material(BLACK) >= RookValueEndgame) + + if (is_KXK(pos)) { - mi->evaluationFunction = &EvaluateKKX; - return mi; + e->evaluationFunction = &EvaluateKXK[BLACK]; + return e; } - else if ( pos.pawns() == EmptyBoardBB - && pos.rooks() == EmptyBoardBB - && pos.queens() == EmptyBoardBB) + + if (!pos.pieces(PAWN) && !pos.pieces(ROOK) && !pos.pieces(QUEEN)) { - // Minor piece endgame with at least one minor piece per side, - // and no pawns. - assert(pos.knights(WHITE) | pos.bishops(WHITE)); - assert(pos.knights(BLACK) | pos.bishops(BLACK)); + // 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(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) { - mi->evaluationFunction = &EvaluateKmmKm; - return mi; + e->evaluationFunction = &EvaluateKmmKm[pos.side_to_move()]; + return e; } } // OK, we didn't find any special evaluation function for the current // material configuration. Is there a suitable scaling function? // - // The code below is rather messy, and it could easily get worse later, - // if we decide to add more special cases. We face problems when there - // are several conflicting applicable scaling functions and we need to - // decide which one to use. - Color c; - EndgameScalingFunctionBase* sf; - - if ((sf = funcs->getESF(key, &c)) != NULL) + // We face problems when there are several conflicting applicable + // scaling functions and we need to decide which one to use. + EndgameBase* sf; + + if (endgames.probe(key, sf)) { - mi->scalingFunction[c] = sf; - return mi; + e->scalingFunction[sf->color()] = sf; + return e; } - if ( pos.non_pawn_material(WHITE) == BishopValueMidgame - && pos.piece_count(WHITE, BISHOP) == 1 - && pos.piece_count(WHITE, PAWN) >= 1) - mi->scalingFunction[WHITE] = &ScaleKBPK; - - if ( pos.non_pawn_material(BLACK) == BishopValueMidgame - && pos.piece_count(BLACK, BISHOP) == 1 - && pos.piece_count(BLACK, PAWN) >= 1) - mi->scalingFunction[BLACK] = &ScaleKKBP; - - if ( pos.piece_count(WHITE, PAWN) == 0 - && pos.non_pawn_material(WHITE) == QueenValueMidgame - && pos.piece_count(WHITE, QUEEN) == 1 - && pos.piece_count(BLACK, ROOK) == 1 - && pos.piece_count(BLACK, PAWN) >= 1) - mi->scalingFunction[WHITE] = &ScaleKQKRP; - - else if ( pos.piece_count(BLACK, PAWN) == 0 - && pos.non_pawn_material(BLACK) == QueenValueMidgame - && pos.piece_count(BLACK, QUEEN) == 1 - && pos.piece_count(WHITE, ROOK) == 1 - && pos.piece_count(WHITE, PAWN) >= 1) - mi->scalingFunction[BLACK] = &ScaleKRPKQ; - - if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == Value(0)) + // 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)) + e->scalingFunction[WHITE] = &ScaleKBPsK[WHITE]; + + if (is_KBPsKs(pos)) + e->scalingFunction[BLACK] = &ScaleKBPsK[BLACK]; + + if (is_KQKRPs(pos)) + e->scalingFunction[WHITE] = &ScaleKQKRPs[WHITE]; + + else if (is_KQKRPs(pos)) + e->scalingFunction[BLACK] = &ScaleKQKRPs[BLACK]; + + Value npm_w = pos.non_pawn_material(WHITE); + Value npm_b = pos.non_pawn_material(BLACK); + + if (npm_w + npm_b == VALUE_ZERO) { if (pos.piece_count(BLACK, PAWN) == 0) { assert(pos.piece_count(WHITE, PAWN) >= 2); - mi->scalingFunction[WHITE] = &ScaleKPsK; + e->scalingFunction[WHITE] = &ScaleKPsK[WHITE]; } else if (pos.piece_count(WHITE, PAWN) == 0) { assert(pos.piece_count(BLACK, PAWN) >= 2); - mi->scalingFunction[BLACK] = &ScaleKKPs; + e->scalingFunction[BLACK] = &ScaleKPsK[BLACK]; } else if (pos.piece_count(WHITE, PAWN) == 1 && pos.piece_count(BLACK, PAWN) == 1) { - mi->scalingFunction[WHITE] = &ScaleKPKPw; - mi->scalingFunction[BLACK] = &ScaleKPKPb; + // This is a special case because we set scaling functions + // for both colors instead of only one. + e->scalingFunction[WHITE] = &ScaleKPKP[WHITE]; + e->scalingFunction[BLACK] = &ScaleKPKP[BLACK]; } } - // Compute the space weight - if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) >= - 2*QueenValueMidgame + 4*RookValueMidgame + 2*KnightValueMidgame) + // No pawns makes it difficult to win, even with a material advantage + if (pos.piece_count(WHITE, PAWN) == 0 && npm_w - npm_b <= BishopValueMg) { - int minorPieceCount = pos.piece_count(WHITE, KNIGHT) - + pos.piece_count(BLACK, KNIGHT) - + pos.piece_count(WHITE, BISHOP) - + pos.piece_count(BLACK, BISHOP); - - mi->spaceWeight = minorPieceCount * minorPieceCount; + e->factor[WHITE] = (uint8_t) + (npm_w == npm_b || npm_w < RookValueMg ? 0 : NoPawnsSF[std::min(pos.piece_count(WHITE, BISHOP), 2)]); } - // Evaluate the material balance - - int sign; - Value egValue = Value(0); - Value mgValue = Value(0); - - for (c = WHITE, sign = 1; c <= BLACK; c++, sign = -sign) + if (pos.piece_count(BLACK, PAWN) == 0 && npm_b - npm_w <= BishopValueMg) { - // No pawns makes it difficult to win, even with a material advantage - 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; - } - } - } - - // Bishop pair - if (pos.piece_count(c, BISHOP) >= 2) - { - mgValue += sign * BishopPairMidgameBonus; - egValue += sign * BishopPairEndgameBonus; - } - - // Knights are stronger when there are many pawns on the board. The - // formula is taken from Larry Kaufman's paper "The Evaluation of Material - // Imbalances in Chess": - // http://mywebpages.comcast.net/danheisman/Articles/evaluation_of_material_imbalance.htm - mgValue += sign * Value(pos.piece_count(c, KNIGHT)*(pos.piece_count(c, PAWN)-5)*16); - egValue += sign * Value(pos.piece_count(c, KNIGHT)*(pos.piece_count(c, PAWN)-5)*16); - - // Redundancy of major pieces, again based on Kaufman's paper: - if (pos.piece_count(c, ROOK) >= 1) - { - Value v = Value((pos.piece_count(c, ROOK) - 1) * 32 + pos.piece_count(c, QUEEN) * 16); - mgValue -= sign * v; - egValue -= sign * v; - } + e->factor[BLACK] = (uint8_t) + (npm_w == npm_b || npm_b < RookValueMg ? 0 : NoPawnsSF[std::min(pos.piece_count(BLACK, BISHOP), 2)]); } - mi->mgValue = int16_t(mgValue); - mi->egValue = int16_t(egValue); - return mi; -} - - -/// EndgameFunctions member definitions. This class is used to store the maps -/// of end game and scaling functions that MaterialInfoTable will query for -/// each key. The maps are constant and are populated only at construction, -/// but are per-thread instead of globals to avoid expensive locks. -EndgameFunctions::EndgameFunctions() { + // Compute the space weight + 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); - typedef Key ZM[2][8][16]; - const ZM& z = Position::zobMaterial; + e->spaceWeight = minorPieceCount * minorPieceCount; + } - static const Color W = WHITE; - static const Color B = BLACK; + // 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) } }; + + e->value = (int16_t)((imbalance(pieceCount) - imbalance(pieceCount)) / 16); + return e; +} - KNNKMaterialKey = z[W][KNIGHT][1] ^ z[W][KNIGHT][2]; - KKNNMaterialKey = z[B][KNIGHT][1] ^ z[B][KNIGHT][2]; - add(z[W][PAWN][1], &EvaluateKPK); - add(z[B][PAWN][1], &EvaluateKKP); +/// MaterialTable::imbalance() calculates imbalance comparing piece count of each +/// piece type for both colors. - add(z[W][BISHOP][1] ^ z[W][KNIGHT][1], &EvaluateKBNK); - add(z[B][BISHOP][1] ^ z[B][KNIGHT][1], &EvaluateKKBN); - add(z[W][ROOK][1] ^ z[B][PAWN][1], &EvaluateKRKP); - add(z[W][PAWN][1] ^ z[B][ROOK][1], &EvaluateKPKR); - add(z[W][ROOK][1] ^ z[B][BISHOP][1], &EvaluateKRKB); - add(z[W][BISHOP][1] ^ z[B][ROOK][1], &EvaluateKBKR); - add(z[W][ROOK][1] ^ z[B][KNIGHT][1], &EvaluateKRKN); - add(z[W][KNIGHT][1] ^ z[B][ROOK][1], &EvaluateKNKR); - add(z[W][QUEEN][1] ^ z[B][ROOK][1], &EvaluateKQKR); - add(z[W][ROOK][1] ^ z[B][QUEEN][1], &EvaluateKRKQ); - add(z[W][BISHOP][2] ^ z[B][KNIGHT][1], &EvaluateKBBKN); - add(z[W][KNIGHT][1] ^ z[B][BISHOP][2], &EvaluateKNKBB); +template +int MaterialTable::imbalance(const int pieceCount[][8]) { - add(z[W][KNIGHT][1] ^ z[W][PAWN][1], W, &ScaleKNPK); - add(z[B][KNIGHT][1] ^ z[B][PAWN][1], B, &ScaleKKNP); + const Color Them = (Us == WHITE ? BLACK : WHITE); - add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[B][ROOK][1] , W, &ScaleKRPKR); - add(z[W][ROOK][1] ^ z[B][ROOK][1] ^ z[B][PAWN][1] , B, &ScaleKRKRP); - add(z[W][BISHOP][1] ^ z[W][PAWN][1] ^ z[B][BISHOP][1], W, &ScaleKBPKB); - add(z[W][BISHOP][1] ^ z[B][BISHOP][1] ^ z[B][PAWN][1] , B, &ScaleKBKBP); - add(z[W][BISHOP][1] ^ z[W][PAWN][1] ^ z[B][KNIGHT][1], W, &ScaleKBPKN); - add(z[W][KNIGHT][1] ^ z[B][BISHOP][1] ^ z[B][PAWN][1] , B, &ScaleKNKBP); + int pt1, pt2, pc, v; + int value = 0; - add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[W][PAWN][2] ^ z[B][ROOK][1] ^ z[B][PAWN][1], W, &ScaleKRPPKRP); - add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[B][ROOK][1] ^ z[B][PAWN][1] ^ z[B][PAWN][2], B, &ScaleKRPKRPP); -} + // 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]; -void EndgameFunctions::add(Key k, EndgameEvaluationFunctionBase* f) { + // Second-degree polynomial material imbalance by Tord Romstad + for (pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; pt1++) + { + pc = pieceCount[Us][pt1]; + if (!pc) + continue; - EEFmap.insert(std::pair(k, f)); -} + v = LinearCoefficients[pt1]; -void EndgameFunctions::add(Key k, Color c, EndgameScalingFunctionBase* f) { + for (pt2 = NO_PIECE_TYPE; pt2 <= pt1; pt2++) + v += QuadraticCoefficientsSameColor[pt1][pt2] * pieceCount[Us][pt2] + + QuadraticCoefficientsOppositeColor[pt1][pt2] * pieceCount[Them][pt2]; - ScalingInfo s = {c, f}; - ESFmap.insert(std::pair(k, s)); + value += pc * v; + } + return value; } -EndgameEvaluationFunctionBase* EndgameFunctions::getEEF(Key key) const { - std::map::const_iterator it(EEFmap.find(key)); - return (it != EEFmap.end() ? it->second : NULL); -} +/// MaterialTable::game_phase() calculates the phase given the current +/// position. Because the phase is strictly a function of the material, it +/// is stored in MaterialEntry. -EndgameScalingFunctionBase* EndgameFunctions::getESF(Key key, Color* c) const { +Phase MaterialTable::game_phase(const Position& pos) { - std::map::const_iterator it(ESFmap.find(key)); - if (it == ESFmap.end()) - return NULL; + Value npm = pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK); - *c = it->second.col; - return it->second.fun; + return npm >= MidgameLimit ? PHASE_MIDGAME + : npm <= EndgameLimit ? PHASE_ENDGAME + : Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit)); }