////
#include <cassert>
+#include <cstring>
#include <map>
#include "material.h"
Key KNNKMaterialKey, KKNNMaterialKey;
- struct ScalingInfo
- {
- Color col;
- ScalingFunction* fun;
- };
-
- std::map<Key, EndgameEvaluationFunction*> EEFmap;
- std::map<Key, ScalingInfo> ESFmap;
-
- void add(Key k, EndgameEvaluationFunction* f) {
-
- EEFmap.insert(std::pair<Key, EndgameEvaluationFunction*>(k, f));
- }
-
- void add(Key k, Color c, ScalingFunction* f) {
-
- ScalingInfo s = {c, f};
- ESFmap.insert(std::pair<Key, ScalingInfo>(k, s));
- }
-
}
-
////
-//// Functions
+//// Classes
////
-/// 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() {
+/// See header for a class description. It is declared here to avoid
+/// to include <map> in the header file.
- typedef Key ZM[2][8][16];
- const ZM& z = Position::zobMaterial;
+class EndgameFunctions {
- static const Color W = WHITE;
- static const Color B = BLACK;
+public:
+ EndgameFunctions();
+ EndgameEvaluationFunction* getEEF(Key key) const;
+ ScalingFunction* getESF(Key key, Color* c) const;
- KNNKMaterialKey = z[W][KNIGHT][1] ^ z[W][KNIGHT][2];
- KKNNMaterialKey = z[B][KNIGHT][1] ^ z[B][KNIGHT][2];
+private:
+ void add(Key k, EndgameEvaluationFunction* f);
+ void add(Key k, Color c, ScalingFunction* f);
- 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);
+ struct ScalingInfo
+ {
+ Color col;
+ ScalingFunction* fun;
+ };
- add(z[W][KNIGHT][1] ^ z[W][PAWN][1], W, &ScaleKNPK);
- add(z[B][KNIGHT][1] ^ z[B][PAWN][1], B, &ScaleKKNP);
+ std::map<Key, EndgameEvaluationFunction*> EEFmap;
+ std::map<Key, ScalingInfo> ESFmap;
+};
- 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);
-}
+////
+//// Functions
+////
/// Constructor for the MaterialInfoTable class
size = numOfEntries;
entries = new MaterialInfo[size];
- if (!entries)
+ funcs = new EndgameFunctions();
+ if (!entries || !funcs)
{
std::cerr << "Failed to allocate " << (numOfEntries * sizeof(MaterialInfo))
<< " bytes for material hash table." << std::endl;
MaterialInfoTable::~MaterialInfoTable() {
delete [] entries;
+ delete funcs;
}
/// 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);
// If mi->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;
+ // return the information we found the last time instead of recomputing it.
+ if (mi->key == key)
+ return mi;
- // Clear the MaterialInfo object, and set its key:
+ // 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
+ // 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
- if (EEFmap.find(key) != EEFmap.end())
- {
- mi->evaluationFunction = EEFmap[key];
+ // particular material configuration.
+ 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)
// 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;
+ ScalingFunction* sf;
- if (ESFmap.find(key) != ESFmap.end())
+ if ((sf = funcs->getESF(key, &c)) != NULL)
{
- mi->scalingFunction[ESFmap[key].col] = ESFmap[key].fun;
+ mi->scalingFunction[c] = sf;
return mi;
}
// Evaluate the material balance
- Color c;
int sign;
Value egValue = Value(0);
Value mgValue = Value(0);
egValue -= sign * v;
}
}
-
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() {
+
+ 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);
+}
+
+void EndgameFunctions::add(Key k, EndgameEvaluationFunction* f) {
+
+ EEFmap.insert(std::pair<Key, EndgameEvaluationFunction*>(k, f));
+}
+
+void EndgameFunctions::add(Key k, Color c, ScalingFunction* f) {
+
+ ScalingInfo s = {c, f};
+ ESFmap.insert(std::pair<Key, ScalingInfo>(k, s));
+}
+
+EndgameEvaluationFunction* EndgameFunctions::getEEF(Key key) const {
+
+ std::map<Key, EndgameEvaluationFunction*>::const_iterator it(EEFmap.find(key));
+ return (it != EEFmap.end() ? it->second : NULL);
+}
+
+ScalingFunction* EndgameFunctions::getESF(Key key, Color* c) const {
+
+ std::map<Key, ScalingInfo>::const_iterator it(ESFmap.find(key));
+ if (it == ESFmap.end())
+ return NULL;
+
+ *c = it->second.col;
+ return it->second.fun;
+}
projects / stockfish / blobdiff