X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=c9dcaba1d42c8441a02bb03638ac80b75d3c3520;hp=10daaeb53ae6df5d3507eda190ca6bb6d99b691a;hb=297c12e595ebc33e11be73ee4b188326418acb4f;hpb=899b9455d6a5ae64f867ce8f78a02c17858e94e9 diff --git a/src/material.cpp b/src/material.cpp index 10daaeb5..c9dcaba1 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-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,10 +23,12 @@ //// #include +#include #include #include "material.h" +using std::string; //// //// Local definitions @@ -34,35 +36,55 @@ namespace { - const Value BishopPairMidgameBonus = Value(100); - const Value BishopPairEndgameBonus = Value(100); + // Values modified by Joona Kiiski + const Value BishopPairMidgameBonus = Value(109); + const Value BishopPairEndgameBonus = Value(97); Key KNNKMaterialKey, KKNNMaterialKey; - struct ScalingInfo - { - Color col; - ScalingFunction* fun; - }; - + // Unmapped endgame evaluation and scaling functions, these + // are accessed direcly and not through the function maps. + EvaluationFunction EvaluateKmmKm(WHITE); + EvaluationFunction EvaluateKXK(WHITE), EvaluateKKX(BLACK); + ScalingFunction ScaleKBPK(WHITE), ScaleKKBP(BLACK); + ScalingFunction ScaleKQKRP(WHITE), ScaleKRPKQ(BLACK); + ScalingFunction ScaleKPsK(WHITE), ScaleKKPs(BLACK); + ScalingFunction ScaleKPKPw(WHITE), ScaleKPKPb(BLACK); } + //// //// Classes //// + +/// See header for a class description. It is declared here to avoid +/// to include in the header file. + class EndgameFunctions { + typedef EndgameEvaluationFunctionBase EF; + typedef EndgameScalingFunctionBase SF; + public: EndgameFunctions(); - EndgameEvaluationFunction* getEEF(Key key); - ScalingInfo getESF(Key key); + ~EndgameFunctions(); + EF* getEEF(Key key) const; + SF* getESF(Key key, Color* c) const; private: - void add(Key k, EndgameEvaluationFunction* f); - void add(Key k, Color c, ScalingFunction* f); + Key buildKey(const string& keyCode); + const string swapColors(const string& keyCode); + template void add_ef(const string& keyCode); + template void add_sf(const string& keyCode); + + struct ScalingInfo + { + Color col; + SF* fun; + }; - std::map EEFmap; + std::map EEFmap; std::map ESFmap; }; @@ -71,19 +93,6 @@ private: //// Functions //// -/// MaterialInfo::init() is called during program initialization. It -/// precomputes material hash keys for a few basic endgames, in order -/// to make it easy to recognize such endgames when they occur. - -void MaterialInfo::init() { - - typedef Key ZM[2][8][16]; - const ZM& z = Position::zobMaterial; - - KNNKMaterialKey = z[WHITE][KNIGHT][1] ^ z[WHITE][KNIGHT][2]; - KKNNMaterialKey = z[BLACK][KNIGHT][1] ^ z[BLACK][KNIGHT][2]; -} - /// Constructor for the MaterialInfoTable class @@ -96,9 +105,8 @@ MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) { { std::cerr << "Failed to allocate " << (numOfEntries * sizeof(MaterialInfo)) << " bytes for material hash table." << std::endl; - exit(EXIT_FAILURE); + Application::exit_with_failure(); } - clear(); } @@ -106,17 +114,8 @@ MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) { MaterialInfoTable::~MaterialInfoTable() { - delete [] entries; delete funcs; -} - - -/// MaterialInfoTable::clear() clears a material hash table by setting -/// all entries to 0. - -void MaterialInfoTable::clear() { - - memset(entries, 0, size * sizeof(MaterialInfo)); + delete [] entries; } @@ -126,7 +125,7 @@ void MaterialInfoTable::clear() { /// is 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) { +MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { Key key = pos.get_material_key(); int index = key & (size - 1); @@ -136,7 +135,7 @@ MaterialInfo *MaterialInfoTable::get_material_info(const Position& pos) { // 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; + return mi; // Clear the MaterialInfo object, and set its key mi->clear(); @@ -146,41 +145,60 @@ MaterialInfo *MaterialInfoTable::get_material_info(const Position& pos) { // KNN vs K is a draw. if (key == KNNKMaterialKey || key == KKNNMaterialKey) { - mi->factor[WHITE] = mi->factor[BLACK] = 0; - return mi; + mi->factor[WHITE] = mi->factor[BLACK] = 0; + return mi; } // Let's look if we have a specialized evaluation function for this - // particular material configuration. + // 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; else if ( pos.non_pawn_material(BLACK) == Value(0) && pos.piece_count(BLACK, PAWN) == 0 - && pos.non_pawn_material(WHITE) >= RookValueEndgame) + && pos.non_pawn_material(WHITE) >= RookValueMidgame) { mi->evaluationFunction = &EvaluateKXK; return mi; } else if ( pos.non_pawn_material(WHITE) == Value(0) && pos.piece_count(WHITE, PAWN) == 0 - && pos.non_pawn_material(BLACK) >= RookValueEndgame) + && pos.non_pawn_material(BLACK) >= RookValueMidgame) { mi->evaluationFunction = &EvaluateKKX; return mi; } + else if ( pos.pawns() == EmptyBoardBB + && pos.rooks() == EmptyBoardBB + && pos.queens() == EmptyBoardBB) + { + // 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)); + + 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; + } + } // 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 + // 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. - ScalingInfo si = funcs->getESF(key); - if (si.fun != NULL) + Color c; + EndgameScalingFunctionBase* sf; + + if ((sf = funcs->getESF(key, &c)) != NULL) { - mi->scalingFunction[si.col] = si.fun; + mi->scalingFunction[c] = sf; return mi; } @@ -227,9 +245,20 @@ MaterialInfo *MaterialInfoTable::get_material_info(const Position& pos) { } } + // Compute the space weight + if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) >= + 2*QueenValueMidgame + 4*RookValueMidgame + 2*KnightValueMidgame) + { + 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; + } + // Evaluate the material balance - Color c; int sign; Value egValue = Value(0); Value mgValue = Value(0); @@ -281,84 +310,107 @@ MaterialInfo *MaterialInfoTable::get_material_info(const Position& pos) { egValue -= sign * v; } } - mi->mgValue = int16_t(mgValue); mi->egValue = int16_t(egValue); return mi; } -/// EndgameFunctions members definition. This helper 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. Being per thread avoids to use locks to access them. +/// 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 needed +/// because std::map is not guaranteed to be thread-safe even if accessed +/// only for a lookup. EndgameFunctions::EndgameFunctions() { - typedef Key ZM[2][8][16]; - const ZM& z = Position::zobMaterial; - - static const Color W = WHITE; - static const Color B = BLACK; - - 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); - - 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][KNIGHT][1] ^ z[W][PAWN][1], W, &ScaleKNPK); - add(z[B][KNIGHT][1] ^ z[B][PAWN][1], B, &ScaleKKNP); - - 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); - - 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); + KNNKMaterialKey = buildKey("KNNK"); + KKNNMaterialKey = buildKey("KKNN"); + + add_ef("KPK"); + add_ef("KBNK"); + add_ef("KRKP"); + add_ef("KRKB"); + add_ef("KRKN"); + add_ef("KQKR"); + add_ef("KBBKN"); + + add_sf("KNPK"); + add_sf("KRPKR"); + add_sf("KBPKB"); + add_sf("KBPPKB"); + add_sf("KBPKN"); + add_sf("KRPPKRP"); + add_sf("KRPPKRP"); +} + +EndgameFunctions::~EndgameFunctions() { + + for (std::map::iterator it = EEFmap.begin(); it != EEFmap.end(); ++it) + delete (*it).second; + + for (std::map::iterator it = ESFmap.begin(); it != ESFmap.end(); ++it) + delete (*it).second.fun; +} + +Key EndgameFunctions::buildKey(const string& keyCode) { + + assert(keyCode.length() > 0 && keyCode[0] == 'K'); + assert(keyCode.length() < 8); + + std::stringstream s; + bool upcase = false; + + // Build up a fen substring 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; + + s << char(upcase? toupper(keyCode[i]) : tolower(keyCode[i])); + } + s << 8 - keyCode.length() << "/8/8/8/8/8/8/8 w -"; + return Position(s.str()).get_material_key(); } -void EndgameFunctions::add(Key k, EndgameEvaluationFunction* f) { +const string EndgameFunctions::swapColors(const string& keyCode) { - EEFmap.insert(std::pair(k, f)); + // Build corresponding key for the opposite color: "KBPKN" -> "KNKBP" + size_t idx = keyCode.find("K", 1); + return keyCode.substr(idx) + keyCode.substr(0, idx); } -void EndgameFunctions::add(Key k, Color c, ScalingFunction* f) { +template +void EndgameFunctions::add_ef(const string& keyCode) { - ScalingInfo s = {c, f}; - ESFmap.insert(std::pair(k, s)); + EEFmap.insert(std::pair(buildKey(keyCode), new EvaluationFunction(WHITE))); + EEFmap.insert(std::pair(buildKey(swapColors(keyCode)), new EvaluationFunction(BLACK))); } -EndgameEvaluationFunction* EndgameFunctions::getEEF(Key key) { +template +void EndgameFunctions::add_sf(const string& keyCode) { + + ScalingInfo s1 = {WHITE, new ScalingFunction(WHITE)}; + ScalingInfo s2 = {BLACK, new ScalingFunction(BLACK)}; + + ESFmap.insert(std::pair(buildKey(keyCode), s1)); + ESFmap.insert(std::pair(buildKey(swapColors(keyCode)), s2)); +} - EndgameEvaluationFunction* f = NULL; - std::map::iterator it(EEFmap.find(key)); - if (it != EEFmap.end()) - f = it->second; +EndgameEvaluationFunctionBase* EndgameFunctions::getEEF(Key key) const { - return f; + std::map::const_iterator it(EEFmap.find(key)); + return (it != EEFmap.end() ? it->second : NULL); } -ScalingInfo EndgameFunctions::getESF(Key key) { +EndgameScalingFunctionBase* EndgameFunctions::getESF(Key key, Color* c) const { - ScalingInfo si = {WHITE, NULL}; - std::map::iterator it(ESFmap.find(key)); - if (it != ESFmap.end()) - si = it->second; + std::map::const_iterator it(ESFmap.find(key)); + if (it == ESFmap.end()) + return NULL; - return si; + *c = it->second.col; + return it->second.fun; }