X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=f5001c99baef8743d9efa777af7268a9be936e5a;hp=31550720c05a48de8c0f764dd56860a9d4afc501;hb=b5d5646c840d63710552fdaf2521a054dd3b8a18;hpb=08c464c690e62b874b7d9b34dfabf455820153d6 diff --git a/src/material.cpp b/src/material.cpp index 31550720..f5001c99 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -19,7 +19,6 @@ #include #include -#include #include "material.h" @@ -48,19 +47,15 @@ namespace { { 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 } }; - typedef EndgameEvaluationFunctionBase EF; - typedef EndgameScalingFunctionBase SF; - typedef map EFMap; - typedef map SFMap; - // 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) { @@ -84,42 +79,13 @@ namespace { && pos.piece_count(Them, ROOK) == 1 && pos.piece_count(Them, PAWN) >= 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. - -class EndgameFunctions { -public: - EndgameFunctions(); - ~EndgameFunctions(); - template T* get(Key key) const; - -private: - template void add(const string& keyCode); - - static Key buildKey(const string& keyCode); - static const string swapColors(const string& keyCode); - - // Here we store two maps, for evaluate and scaling functions... - pair maps; - - // ...and here is the accessing template function - template const map& get() const; -}; -// 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; } +} // namespace -/// MaterialInfoTable c'tor and d'tor allocate and free the space for EndgameFunctions +/// MaterialInfoTable c'tor and d'tor allocate and free the space for Endgames -MaterialInfoTable::MaterialInfoTable() { funcs = new EndgameFunctions(); } +MaterialInfoTable::MaterialInfoTable() { funcs = new Endgames(); } MaterialInfoTable::~MaterialInfoTable() { delete funcs; } @@ -151,7 +117,7 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) const { // 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) + if ((mi->evaluationFunction = funcs->get >(key)) != NULL) return mi; if (is_KXK(pos)) @@ -186,9 +152,9 @@ 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 ((sf = funcs->get >(key)) != NULL) { mi->scalingFunction[sf->color()] = sf; return mi; @@ -277,7 +243,7 @@ int MaterialInfoTable::imbalance(const int pieceCount[][8]) { const Color Them = (Us == WHITE ? BLACK : WHITE); - int pt1, pt2, pc, vv; + int pt1, pt2, pc, v; int value = 0; // Redundancy of major pieces, formula based on Kaufman's paper @@ -293,13 +259,13 @@ int MaterialInfoTable::imbalance(const int pieceCount[][8]) { if (!pc) continue; - vv = LinearCoefficients[pt1]; + v = LinearCoefficients[pt1]; for (pt2 = PIECE_TYPE_NONE; pt2 <= pt1; pt2++) - vv += QuadraticCoefficientsSameColor[pt1][pt2] * pieceCount[Us][pt2] - + QuadraticCoefficientsOppositeColor[pt1][pt2] * pieceCount[Them][pt2]; + v += QuadraticCoefficientsSameColor[pt1][pt2] * pieceCount[Us][pt2] + + QuadraticCoefficientsOppositeColor[pt1][pt2] * pieceCount[Them][pt2]; - value += pc * vv; + value += pc * v; } return value; } @@ -313,88 +279,7 @@ Phase MaterialInfoTable::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; -} - -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; + return npm >= MidgameLimit ? PHASE_MIDGAME + : npm <= EndgameLimit ? PHASE_ENDGAME + : Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit)); }