X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=595eee2983b087e428ec0f09156e88189028a298;hp=ce7d7ab591881c2a030ac57efd954822c6ad9425;hb=787d3585548ed7dac06597780a7d0adb64482d41;hpb=73cce873de9ae241d30d405893dcc25e85293b98 diff --git a/src/material.cpp b/src/material.cpp index ce7d7ab5..595eee29 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -23,6 +23,7 @@ //// #include +#include #include #include "material.h" @@ -37,116 +38,53 @@ namespace { const Value BishopPairMidgameBonus = Value(100); const Value BishopPairEndgameBonus = Value(100); - Key KRPKRMaterialKey, KRKRPMaterialKey; - Key KNNKMaterialKey, KKNNMaterialKey; - Key KBPKBMaterialKey, KBKBPMaterialKey; - Key KBPKNMaterialKey, KNKBPMaterialKey; - Key KNPKMaterialKey, KKNPMaterialKey; - Key KPKPMaterialKey; - Key KRPPKRPMaterialKey, KRPKRPPMaterialKey; + Key KNNKMaterialKey, KKNNMaterialKey; - std::map EEFmap; - - void EEFAdd(Key k, EndgameEvaluationFunction* f) { - - EEFmap.insert(std::pair(k, f)); - } } - //// -//// 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. - typedef Key ZM[2][8][16]; - const ZM& z = Position::zobMaterial; +class EndgameFunctions { - static const Color W = WHITE; - static const Color B = BLACK; - - EEFAdd(z[W][PAWN][1], &EvaluateKPK); - EEFAdd(z[B][PAWN][1], &EvaluateKKP); - - EEFAdd(z[W][BISHOP][1] ^ z[W][KNIGHT][1], &EvaluateKBNK); - EEFAdd(z[B][BISHOP][1] ^ z[B][KNIGHT][1], &EvaluateKKBN); - EEFAdd(z[W][ROOK][1] ^ z[B][PAWN][1], &EvaluateKRKP); - EEFAdd(z[W][PAWN][1] ^ z[B][ROOK][1], &EvaluateKPKR); - EEFAdd(z[W][ROOK][1] ^ z[B][BISHOP][1], &EvaluateKRKB); - EEFAdd(z[W][BISHOP][1] ^ z[B][ROOK][1], &EvaluateKBKR); - EEFAdd(z[W][ROOK][1] ^ z[B][KNIGHT][1], &EvaluateKRKN); - EEFAdd(z[W][KNIGHT][1] ^ z[B][ROOK][1], &EvaluateKNKR); - EEFAdd(z[W][QUEEN][1] ^ z[B][ROOK][1], &EvaluateKQKR); - EEFAdd(z[W][ROOK][1] ^ z[B][QUEEN][1], &EvaluateKRKQ); - - KRPKRMaterialKey = z[W][ROOK][1] - ^ z[W][PAWN][1] - ^ z[B][ROOK][1]; - - KRKRPMaterialKey = z[W][ROOK][1] - ^ z[B][ROOK][1] - ^ z[B][PAWN][1]; - - KRPPKRPMaterialKey = - z[W][ROOK][1] ^ - z[W][PAWN][1] ^ - z[W][PAWN][2] ^ - z[B][ROOK][1] ^ - z[B][PAWN][1]; - KRPKRPPMaterialKey = - z[W][ROOK][1] ^ - z[W][PAWN][1] ^ - z[B][ROOK][1] ^ - z[B][PAWN][1] ^ - z[B][PAWN][2]; - KNNKMaterialKey = - z[W][KNIGHT][1] ^ - z[W][KNIGHT][2]; - KKNNMaterialKey = - z[B][KNIGHT][1] ^ - z[B][KNIGHT][2]; - KBPKBMaterialKey = - z[W][BISHOP][1] ^ - z[W][PAWN][1] ^ - z[B][BISHOP][1]; - KBKBPMaterialKey = - z[W][BISHOP][1] ^ - z[B][BISHOP][1] ^ - z[B][PAWN][1]; - KBPKNMaterialKey = - z[W][BISHOP][1] ^ - z[W][PAWN][1] ^ - z[B][KNIGHT][1]; - KNKBPMaterialKey = - z[W][KNIGHT][1] ^ - z[B][BISHOP][1] ^ - z[B][PAWN][1]; - KNPKMaterialKey = - z[W][KNIGHT][1] ^ - z[W][PAWN][1]; - KKNPMaterialKey = - z[B][KNIGHT][1] ^ - z[B][PAWN][1]; - KPKPMaterialKey = - z[W][PAWN][1] ^ - z[B][PAWN][1]; +public: + EndgameFunctions(); + EndgameEvaluationFunction* getEEF(Key key) const; + ScalingFunction* getESF(Key key, Color* c) const; +private: + void add(Key k, EndgameEvaluationFunction* f); + void add(Key k, Color c, ScalingFunction* f); -} + struct ScalingInfo + { + Color col; + ScalingFunction* fun; + }; + + std::map EEFmap; + std::map ESFmap; +}; + + +//// +//// Functions +//// -/// Constructor for the MaterialInfoTable class. +/// Constructor for the MaterialInfoTable class -MaterialInfoTable::MaterialInfoTable(unsigned numOfEntries) { +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; @@ -156,11 +94,12 @@ MaterialInfoTable::MaterialInfoTable(unsigned numOfEntries) { } -/// Destructor for the MaterialInfoTable class. +/// Destructor for the MaterialInfoTable class MaterialInfoTable::~MaterialInfoTable() { delete [] entries; + delete funcs; } @@ -179,37 +118,35 @@ 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); - MaterialInfo *mi = entries + index; + MaterialInfo* mi = entries + index; // 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: + // A special case before looking for a specialized evaluation function + // 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) @@ -232,113 +169,94 @@ 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. + Color c; + ScalingFunction* sf; - if(key == KRPKRMaterialKey) { - mi->scalingFunction[WHITE] = &ScaleKRPKR; - return mi; - } - if(key == KRKRPMaterialKey) { - mi->scalingFunction[BLACK] = &ScaleKRKRP; - return mi; - } - if(key == KRPPKRPMaterialKey) { - mi->scalingFunction[WHITE] = &ScaleKRPPKRP; - return mi; - } - else if(key == KRPKRPPMaterialKey) { - mi->scalingFunction[BLACK] = &ScaleKRPKRPP; - return mi; - } - if(key == KBPKBMaterialKey) { - mi->scalingFunction[WHITE] = &ScaleKBPKB; - return mi; - } - if(key == KBKBPMaterialKey) { - mi->scalingFunction[BLACK] = &ScaleKBKBP; - return mi; - } - if(key == KBPKNMaterialKey) { - mi->scalingFunction[WHITE] = &ScaleKBPKN; - return mi; - } - if(key == KNKBPMaterialKey) { - mi->scalingFunction[BLACK] = &ScaleKNKBP; - return mi; - } - if(key == KNPKMaterialKey) { - mi->scalingFunction[WHITE] = &ScaleKNPK; - return mi; - } - if(key == KKNPMaterialKey) { - mi->scalingFunction[BLACK] = &ScaleKKNP; - return mi; + if ((sf = funcs->getESF(key, &c)) != NULL) + { + mi->scalingFunction[c] = sf; + return mi; } - if(pos.non_pawn_material(WHITE) == BishopValueMidgame && - pos.piece_count(WHITE, BISHOP) == 1 && pos.piece_count(WHITE, PAWN) >= 1) - mi->scalingFunction[WHITE] = &ScaleKBPK; - if(pos.non_pawn_material(BLACK) == BishopValueMidgame && - pos.piece_count(BLACK, BISHOP) == 1 && pos.piece_count(BLACK, PAWN) >= 1) - mi->scalingFunction[BLACK] = &ScaleKKBP; - - if(pos.piece_count(WHITE, PAWN) == 0 && - pos.non_pawn_material(WHITE) == QueenValueMidgame && - pos.piece_count(WHITE, QUEEN) == 1 && - pos.piece_count(BLACK, ROOK) == 1 && pos.piece_count(BLACK, PAWN) >= 1) - mi->scalingFunction[WHITE] = &ScaleKQKRP; - else if(pos.piece_count(BLACK, PAWN) == 0 && - pos.non_pawn_material(BLACK) == QueenValueMidgame && - pos.piece_count(BLACK, QUEEN) == 1 && - pos.piece_count(WHITE, ROOK) == 1 && pos.piece_count(WHITE, PAWN) >= 1) - mi->scalingFunction[BLACK] = &ScaleKRPKQ; - - if(pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == Value(0)) { - if(pos.piece_count(BLACK, PAWN) == 0) { - assert(pos.piece_count(WHITE, PAWN) >= 2); - mi->scalingFunction[WHITE] = &ScaleKPsK; - } - else if(pos.piece_count(WHITE, PAWN) == 0) { - assert(pos.piece_count(BLACK, PAWN) >= 2); - mi->scalingFunction[BLACK] = &ScaleKKPs; - } - else if(pos.piece_count(WHITE, PAWN) == 1 && pos.piece_count(BLACK, PAWN) == 1) { - mi->scalingFunction[WHITE] = &ScaleKPKPw; - mi->scalingFunction[BLACK] = &ScaleKPKPb; - } + if ( pos.non_pawn_material(WHITE) == BishopValueMidgame + && pos.piece_count(WHITE, BISHOP) == 1 + && pos.piece_count(WHITE, PAWN) >= 1) + mi->scalingFunction[WHITE] = &ScaleKBPK; + + if ( pos.non_pawn_material(BLACK) == BishopValueMidgame + && pos.piece_count(BLACK, BISHOP) == 1 + && pos.piece_count(BLACK, PAWN) >= 1) + mi->scalingFunction[BLACK] = &ScaleKKBP; + + if ( pos.piece_count(WHITE, PAWN) == 0 + && pos.non_pawn_material(WHITE) == QueenValueMidgame + && pos.piece_count(WHITE, QUEEN) == 1 + && pos.piece_count(BLACK, ROOK) == 1 + && pos.piece_count(BLACK, PAWN) >= 1) + mi->scalingFunction[WHITE] = &ScaleKQKRP; + + else if ( pos.piece_count(BLACK, PAWN) == 0 + && pos.non_pawn_material(BLACK) == QueenValueMidgame + && pos.piece_count(BLACK, QUEEN) == 1 + && pos.piece_count(WHITE, ROOK) == 1 + && pos.piece_count(WHITE, PAWN) >= 1) + mi->scalingFunction[BLACK] = &ScaleKRPKQ; + + if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == Value(0)) + { + if (pos.piece_count(BLACK, PAWN) == 0) + { + assert(pos.piece_count(WHITE, PAWN) >= 2); + mi->scalingFunction[WHITE] = &ScaleKPsK; + } + else if (pos.piece_count(WHITE, PAWN) == 0) + { + assert(pos.piece_count(BLACK, PAWN) >= 2); + mi->scalingFunction[BLACK] = &ScaleKKPs; + } + else if (pos.piece_count(WHITE, PAWN) == 1 && pos.piece_count(BLACK, PAWN) == 1) + { + mi->scalingFunction[WHITE] = &ScaleKPKPw; + mi->scalingFunction[BLACK] = &ScaleKPKPb; + } } - // Evaluate the material balance. + // Evaluate the material balance - Color c; int sign; - Value egValue = Value(0), mgValue = Value(0); - - for(c = WHITE, sign = 1; c <= BLACK; c++, sign = -sign) { - - // No pawns makes it difficult to win, even with a material advantage: - if(pos.piece_count(c, PAWN) == 0 && - pos.non_pawn_material(c) - pos.non_pawn_material(opposite_color(c)) - <= BishopValueMidgame) { - if(pos.non_pawn_material(c) == pos.non_pawn_material(opposite_color(c))) - mi->factor[c] = 0; - else if(pos.non_pawn_material(c) < RookValueMidgame) - mi->factor[c] = 0; - else { - switch(pos.piece_count(c, BISHOP)) { - case 2: - mi->factor[c] = 32; break; - case 1: - mi->factor[c] = 12; break; - case 0: - mi->factor[c] = 6; break; + Value egValue = Value(0); + Value mgValue = Value(0); + + for (c = WHITE, sign = 1; c <= BLACK; c++, sign = -sign) + { + // No pawns makes it difficult to win, even with a material advantage + if ( pos.piece_count(c, PAWN) == 0 + && pos.non_pawn_material(c) - pos.non_pawn_material(opposite_color(c)) <= BishopValueMidgame) + { + if ( pos.non_pawn_material(c) == pos.non_pawn_material(opposite_color(c)) + || pos.non_pawn_material(c) < RookValueMidgame) + mi->factor[c] = 0; + else + { + switch (pos.piece_count(c, BISHOP)) { + case 2: + mi->factor[c] = 32; + break; + case 1: + mi->factor[c] = 12; + break; + case 0: + mi->factor[c] = 6; + break; + } } - } } - // Bishop pair: - if(pos.piece_count(c, BISHOP) >= 2) { - mgValue += sign * BishopPairMidgameBonus; - egValue += sign * BishopPairEndgameBonus; + // Bishop pair + if (pos.piece_count(c, BISHOP) >= 2) + { + mgValue += sign * BishopPairMidgameBonus; + egValue += sign * BishopPairEndgameBonus; } // Knights are stronger when there are many pawns on the board. The @@ -349,16 +267,86 @@ MaterialInfo *MaterialInfoTable::get_material_info(const Position &pos) { egValue += sign * Value(pos.piece_count(c, KNIGHT)*(pos.piece_count(c, PAWN)-5)*16); // Redundancy of major pieces, again based on Kaufman's paper: - if(pos.piece_count(c, ROOK) >= 1) { - Value v = Value((pos.piece_count(c, ROOK) - 1) * 32 + pos.piece_count(c, QUEEN) * 16); - mgValue -= sign * v; - egValue -= sign * v; + if (pos.piece_count(c, ROOK) >= 1) + { + Value v = Value((pos.piece_count(c, ROOK) - 1) * 32 + pos.piece_count(c, QUEEN) * 16); + mgValue -= sign * v; + 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(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; +}