X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=6a51cb64da97bd1284bf161d4de8d87b96803bb8;hp=bdfd393962927ca81ffd2f4c8098ac693a4c0632;hb=c97104e8540b72ee2c6c9c13d3773d2c0f9ec32f;hpb=bd3ec6af15200dce777db821ecaf8d808632f605 diff --git a/src/material.cpp b/src/material.cpp index bdfd3939..6a51cb64 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -23,9 +23,9 @@ //// #include +#include #include -#include "lock.h" #include "material.h" @@ -40,110 +40,41 @@ namespace { Key KNNKMaterialKey, KKNNMaterialKey; - struct ScalingInfo - { - Color col; - ScalingFunction* fun; - }; - - std::map EEFmap; - std::map ESFmap; - - Lock EEFmapLock; - Lock ESFmapLock; - - void add(Key k, EndgameEvaluationFunction* f) { - - EEFmap.insert(std::pair(k, f)); - } - - void add(Key k, Color c, ScalingFunction* f) { - - ScalingInfo s = {c, f}; - ESFmap.insert(std::pair(k, s)); - } - - // STL map are not guaranteed to be thread safe even - // for read-access so we need this two helpers to access them. - EndgameEvaluationFunction* getEEF(Key key) { - - EndgameEvaluationFunction* f = NULL; - - lock_grab(&EEFmapLock); - - if (EEFmap.find(key) != EEFmap.end()) - f = EEFmap[key]; - - lock_release(&EEFmapLock); - return f; - } - - ScalingInfo getESF(Key key) { - - ScalingInfo si = {WHITE, NULL}; - - lock_grab(&ESFmapLock); - - if (ESFmap.find(key) != ESFmap.end()) - si = ESFmap[key]; - - lock_release(&ESFmapLock); - return si; - } - } - //// -//// 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 in the header file. - // Initialize std::map access locks - lock_init(&EEFmapLock, NULL); - lock_init(&ESFmapLock, NULL); +class EndgameFunctions { - typedef Key ZM[2][8][16]; - const ZM& z = Position::zobMaterial; +public: + EndgameFunctions(); + EndgameEvaluationFunction* getEEF(Key key) const; + ScalingFunction* getESF(Key key, Color* c) const; - static const Color W = WHITE; - static const Color B = BLACK; +private: + void add(Key k, EndgameEvaluationFunction* f); + void add(Key k, Color c, ScalingFunction* f); - 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); + 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 EEFmap; + std::map 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 @@ -152,7 +83,8 @@ MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) { 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; @@ -167,6 +99,7 @@ MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) { MaterialInfoTable::~MaterialInfoTable() { delete [] entries; + delete funcs; } @@ -185,7 +118,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); @@ -195,7 +128,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(); @@ -205,13 +138,13 @@ 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. - if ((mi->evaluationFunction = getEEF(key)) != NULL) + if ((mi->evaluationFunction = funcs->getEEF(key)) != NULL) return mi; else if ( pos.non_pawn_material(BLACK) == Value(0) @@ -228,6 +161,22 @@ MaterialInfo *MaterialInfoTable::get_material_info(const Position& pos) { 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? @@ -236,10 +185,12 @@ MaterialInfo *MaterialInfoTable::get_material_info(const Position& pos) { // 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 = getESF(key); - if (si.fun != NULL) + Color c; + ScalingFunction* sf; + + if ((sf = funcs->getESF(key, &c)) != NULL) { - mi->scalingFunction[si.col] = si.fun; + mi->scalingFunction[c] = sf; return mi; } @@ -286,9 +237,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); @@ -340,8 +302,81 @@ MaterialInfo *MaterialInfoTable::get_material_info(const Position& pos) { 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][BISHOP][2] ^ z[B][KNIGHT][1], &EvaluateKBBKN); + add(z[W][KNIGHT][1] ^ z[B][BISHOP][2], &EvaluateKNKBB); + + 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(k, f)); +} + +void EndgameFunctions::add(Key k, Color c, ScalingFunction* f) { + + ScalingInfo s = {c, f}; + ESFmap.insert(std::pair(k, s)); +} + +EndgameEvaluationFunction* EndgameFunctions::getEEF(Key key) const { + + std::map::const_iterator it(EEFmap.find(key)); + return (it != EEFmap.end() ? it->second : NULL); +} + +ScalingFunction* EndgameFunctions::getESF(Key key, Color* c) const { + + std::map::const_iterator it(ESFmap.find(key)); + if (it == ESFmap.end()) + return NULL; + + *c = it->second.col; + return it->second.fun; +}