Key KNNKMaterialKey, KKNNMaterialKey;
+ // Unmapped endgame evaluation and scaling functions, these
+ // are accessed direcly and not through the function maps.
+ EvaluationFunction<KmmKm> EvaluateKmmKm(WHITE);
+ EvaluationFunction<KXK> EvaluateKXK(WHITE), EvaluateKKX(BLACK);
+ ScalingFunction<KBPK> ScaleKBPK(WHITE), ScaleKKBP(BLACK);
+ ScalingFunction<KQKRP> ScaleKQKRP(WHITE), ScaleKRPKQ(BLACK);
+ ScalingFunction<KPsK> ScaleKPsK(WHITE), ScaleKKPs(BLACK);
+ ScalingFunction<KPKP> ScaleKPKPw(WHITE), ScaleKPKPb(BLACK);
}
+
////
//// Classes
////
class EndgameFunctions {
+ typedef EndgameEvaluationFunctionBase EF;
+ typedef EndgameScalingFunctionBase SF;
+
public:
EndgameFunctions();
- EndgameEvaluationFunctionBase* getEEF(Key key) const;
- EndgameScalingFunctionBase* getESF(Key key, Color* c) const;
+ ~EndgameFunctions();
+ template<class T> T* get(Key key) const;
private:
- void add(const string& keyCode, EndgameEvaluationFunctionBase* f);
- void add(const string& keyCode, Color c, EndgameScalingFunctionBase* f);
- Key buildKey(const string& keyCode);
+ template<class T> void add(const string& keyCode);
- struct ScalingInfo
- {
- Color col;
- EndgameScalingFunctionBase* fun;
- };
+ static Key buildKey(const string& keyCode);
+ static const string swapColors(const string& keyCode);
+
+ std::map<Key, EF*> EEFmap;
+ std::map<Key, SF*> ESFmap;
- std::map<Key, EndgameEvaluationFunctionBase*> EEFmap;
- std::map<Key, ScalingInfo> ESFmap;
+ // Maps accessing functions for const and non-const references
+ template<typename T> const std::map<Key, T*>& map() const { return EEFmap; }
+ template<> const std::map<Key, SF*>& map<SF>() const { return ESFmap; }
+ template<typename T> std::map<Key, T*>& map() { return EEFmap; }
+ template<> std::map<Key, SF*>& map<SF>() { return ESFmap; }
};
// 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)
+ if ((mi->evaluationFunction = funcs->get<EndgameEvaluationFunctionBase>(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;
// 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.
- Color c;
EndgameScalingFunctionBase* sf;
- if ((sf = funcs->getESF(key, &c)) != NULL)
+ if ((sf = funcs->get<EndgameScalingFunctionBase>(key)) != NULL)
{
- mi->scalingFunction[c] = sf;
+ mi->scalingFunction[sf->color()] = sf;
return mi;
}
// Evaluate the material balance
+ Color c;
int sign;
Value egValue = Value(0);
Value mgValue = Value(0);
/// 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.
+/// 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() {
KNNKMaterialKey = buildKey("KNNK");
KKNNMaterialKey = buildKey("KKNN");
- add("KPK", &EvaluateKPK);
- add("KKP", &EvaluateKKP);
- add("KBNK", &EvaluateKBNK);
- add("KKBN", &EvaluateKKBN);
- add("KRKP", &EvaluateKRKP);
- add("KPKR", &EvaluateKPKR);
- add("KRKB", &EvaluateKRKB);
- add("KBKR", &EvaluateKBKR);
- add("KRKN", &EvaluateKRKN);
- add("KNKR", &EvaluateKNKR);
- add("KQKR", &EvaluateKQKR);
- add("KRKQ", &EvaluateKRKQ);
- add("KBBKN", &EvaluateKBBKN);
- add("KNKBB", &EvaluateKNKBB);
-
- add("KNPK", WHITE, &ScaleKNPK);
- add("KKNP", BLACK, &ScaleKKNP);
- add("KRPKR", WHITE, &ScaleKRPKR);
- add("KRKRP", BLACK, &ScaleKRKRP);
- add("KBPKB", WHITE, &ScaleKBPKB);
- add("KBKBP", BLACK, &ScaleKBKBP);
- add("KBPPKB", WHITE, &ScaleKBPPKB);
- add("KBKBPP", BLACK, &ScaleKBKBPP);
- add("KBPKN", WHITE, &ScaleKBPKN);
- add("KNKBP", BLACK, &ScaleKNKBP);
- add("KRPPKRP", WHITE, &ScaleKRPPKRP);
- add("KRPKRPP", BLACK, &ScaleKRPKRPP);
- add("KRPPKRP", WHITE, &ScaleKRPPKRP);
- add("KRPKRPP", BLACK, &ScaleKRPKRPP);
+ add<EvaluationFunction<KPK> >("KPK");
+ add<EvaluationFunction<KBNK> >("KBNK");
+ add<EvaluationFunction<KRKP> >("KRKP");
+ add<EvaluationFunction<KRKB> >("KRKB");
+ add<EvaluationFunction<KRKN> >("KRKN");
+ add<EvaluationFunction<KQKR> >("KQKR");
+ add<EvaluationFunction<KBBKN> >("KBBKN");
+
+ add<ScalingFunction<KNPK> >("KNPK");
+ add<ScalingFunction<KRPKR> >("KRPKR");
+ add<ScalingFunction<KBPKB> >("KBPKB");
+ add<ScalingFunction<KBPPKB> >("KBPPKB");
+ add<ScalingFunction<KBPKN> >("KBPKN");
+ add<ScalingFunction<KRPPKRP> >("KRPPKRP");
+ add<ScalingFunction<KRPPKRP> >("KRPPKRP");
+}
+
+EndgameFunctions::~EndgameFunctions() {
+
+ for (std::map<Key, EF*>::iterator it = EEFmap.begin(); it != EEFmap.end(); ++it)
+ delete (*it).second;
+
+ for (std::map<Key, SF*>::iterator it = ESFmap.begin(); it != ESFmap.end(); ++it)
+ delete (*it).second;
}
Key EndgameFunctions::buildKey(const string& keyCode) {
return Position(s.str()).get_material_key();
}
-void EndgameFunctions::add(const string& keyCode, EndgameEvaluationFunctionBase* f) {
+const string EndgameFunctions::swapColors(const string& keyCode) {
- EEFmap.insert(std::pair<Key, EndgameEvaluationFunctionBase*>(buildKey(keyCode), 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(const string& keyCode, Color c, EndgameScalingFunctionBase* f) {
+template<class T>
+void EndgameFunctions::add(const string& keyCode) {
- ScalingInfo s = {c, f};
- ESFmap.insert(std::pair<Key, ScalingInfo>(buildKey(keyCode), s));
-}
-
-EndgameEvaluationFunctionBase* EndgameFunctions::getEEF(Key key) const {
+ typedef typename T::Base F;
- std::map<Key, EndgameEvaluationFunctionBase*>::const_iterator it(EEFmap.find(key));
- return (it != EEFmap.end() ? it->second : NULL);
+ map<F>().insert(std::pair<Key, F*>(buildKey(keyCode), new T(WHITE)));
+ map<F>().insert(std::pair<Key, F*>(buildKey(swapColors(keyCode)), new T(BLACK)));
}
-EndgameScalingFunctionBase* EndgameFunctions::getESF(Key key, Color* c) const {
-
- std::map<Key, ScalingInfo>::const_iterator it(ESFmap.find(key));
- if (it == ESFmap.end())
- return NULL;
+template<class T>
+T* EndgameFunctions::get(Key key) const {
- *c = it->second.col;
- return it->second.fun;
+ std::map<Key, T*>::const_iterator it(map<T>().find(key));
+ return (it != map<T>().end() ? it->second : NULL);
}
projects / stockfish / blobdiff