X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=0112300080f56c43a3ae16823a990975b1247dc1;hp=65c8c86292df1c2e12bac5336f01f8820337ce4a;hb=efeb37c33f15a903dbe5706529a7a26511e9ca58;hpb=11207f7c1f943aa02bccbfa5eff6fdd18859721f diff --git a/src/material.cpp b/src/material.cpp index 65c8c862..01123000 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -23,6 +23,7 @@ //// #include +#include #include #include @@ -55,17 +56,42 @@ 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 } }; - // Named endgame evaluation and scaling functions, these - // are accessed direcly and not through the function maps. - EvaluationFunction EvaluateKmmKm(WHITE); - EvaluationFunction EvaluateKXK(WHITE), EvaluateKKX(BLACK); - ScalingFunction ScaleKBPsK(WHITE), ScaleKKBPs(BLACK); - ScalingFunction ScaleKQKRPs(WHITE), ScaleKRPsKQ(BLACK); - ScalingFunction ScaleKPsK(WHITE), ScaleKKPs(BLACK); - ScalingFunction ScaleKPKPw(WHITE), ScaleKPKPb(BLACK); - 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) }; + + // Helper templates used to detect a given material distribution + template bool is_KXK(const Position& pos) { + const Color Them = (Us == WHITE ? BLACK : WHITE); + return pos.non_pawn_material(Them) == VALUE_ZERO + && pos.piece_count(Them, PAWN) == 0 + && pos.non_pawn_material(Us) >= RookValueMidgame; + } + + template bool is_KBPsK(const Position& pos) { + return pos.non_pawn_material(Us) == BishopValueMidgame + && pos.piece_count(Us, BISHOP) == 1 + && pos.piece_count(Us, PAWN) >= 1; + } + + template bool is_KQKRPs(const Position& pos) { + const Color Them = (Us == WHITE ? BLACK : WHITE); + return pos.piece_count(Us, PAWN) == 0 + && pos.non_pawn_material(Us) == QueenValueMidgame + && pos.piece_count(Us, QUEEN) == 1 + && pos.piece_count(Them, ROOK) == 1 + && pos.piece_count(Them, PAWN) >= 1; + } } @@ -90,21 +116,17 @@ private: static Key buildKey(const string& keyCode); static const string swapColors(const string& keyCode); - // Here we store two maps, for evaluate and scaling functions - pair, map > maps; + // Here we store two maps, for evaluate and scaling functions... + pair maps; - // Maps accessing functions returning const and non-const references - template const map& get() const { return maps.first; } - template map& get() { return maps.first; } + // ...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 map& -EndgameFunctions::get() const { return maps.second; } - -template<> map& -EndgameFunctions::get() { return maps.second; } +template<> const EFMap& EndgameFunctions::get() const { return maps.first; } +template<> const SFMap& EndgameFunctions::get() const { return maps.second; } //// @@ -113,18 +135,18 @@ EndgameFunctions::get() { return maps.second; } /// MaterialInfoTable c'tor and d'tor, called once by each thread -MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) { +MaterialInfoTable::MaterialInfoTable() { - size = numOfEntries; - entries = new MaterialInfo[size]; + entries = new MaterialInfo[MaterialTableSize]; funcs = new EndgameFunctions(); if (!entries || !funcs) { - cerr << "Failed to allocate " << numOfEntries * sizeof(MaterialInfo) + cerr << "Failed to allocate " << MaterialTableSize * sizeof(MaterialInfo) << " bytes for material hash table." << endl; - Application::exit_with_failure(); + exit(EXIT_FAILURE); } + memset(entries, 0, MaterialTableSize * sizeof(MaterialInfo)); } MaterialInfoTable::~MaterialInfoTable() { @@ -144,7 +166,8 @@ Phase MaterialInfoTable::game_phase(const Position& pos) { if (npm >= MidgameLimit) return PHASE_MIDGAME; - else if (npm <= EndgameLimit) + + if (npm <= EndgameLimit) return PHASE_ENDGAME; return Phase(((npm - EndgameLimit) * 128) / (MidgameLimit - EndgameLimit)); @@ -159,7 +182,7 @@ Phase MaterialInfoTable::game_phase(const Position& pos) { MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { Key key = pos.get_material_key(); - int index = key & (size - 1); + unsigned index = unsigned(key & (MaterialTableSize - 1)); MaterialInfo* mi = entries + index; // If mi->key matches the position's material hash key, it means that we @@ -169,7 +192,8 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { return mi; // Clear the MaterialInfo object, and set its key - mi->clear(); + memset(mi, 0, sizeof(MaterialInfo)); + mi->factor[WHITE] = mi->factor[BLACK] = uint8_t(SCALE_FACTOR_NORMAL); mi->key = key; // Store game phase @@ -181,23 +205,15 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { if ((mi->evaluationFunction = funcs->get(key)) != NULL) return mi; - else if ( pos.non_pawn_material(BLACK) == Value(0) - && pos.piece_count(BLACK, PAWN) == 0 - && pos.non_pawn_material(WHITE) >= RookValueMidgame) + if (is_KXK(pos) || is_KXK(pos)) { - mi->evaluationFunction = &EvaluateKXK; + mi->evaluationFunction = is_KXK(pos) ? &EvaluateKXK[WHITE] : &EvaluateKXK[BLACK]; return mi; } - else if ( pos.non_pawn_material(WHITE) == Value(0) - && pos.piece_count(WHITE, PAWN) == 0 - && pos.non_pawn_material(BLACK) >= RookValueMidgame) - { - mi->evaluationFunction = &EvaluateKKX; - return mi; - } - else if ( pos.pieces(PAWN) == EmptyBoardBB - && pos.pieces(ROOK) == EmptyBoardBB - && pos.pieces(QUEEN) == EmptyBoardBB) + + if ( pos.pieces(PAWN) == EmptyBoardBB + && pos.pieces(ROOK) == EmptyBoardBB + && pos.pieces(QUEEN) == EmptyBoardBB) { // Minor piece endgame with at least one minor piece per side and // no pawns. Note that the case KmmK is already handled by KXK. @@ -207,7 +223,7 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { 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; + mi->evaluationFunction = &EvaluateKmmKm[WHITE]; return mi; } } @@ -215,10 +231,8 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { // OK, we didn't find any special evaluation function for the current // 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 - // are several conflicting applicable scaling functions and we need to - // decide which one to use. + // We face problems when there are several conflicting applicable + // scaling functions and we need to decide which one to use. SF* sf; if ((sf = funcs->get(key)) != NULL) @@ -230,48 +244,36 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { // Generic scaling functions that refer to more then one material // distribution. Should be probed after the specialized ones. // Note that these ones don't return after setting the function. - if ( pos.non_pawn_material(WHITE) == BishopValueMidgame - && pos.piece_count(WHITE, BISHOP) == 1 - && pos.piece_count(WHITE, PAWN) >= 1) - mi->scalingFunction[WHITE] = &ScaleKBPsK; - - if ( pos.non_pawn_material(BLACK) == BishopValueMidgame - && pos.piece_count(BLACK, BISHOP) == 1 - && pos.piece_count(BLACK, PAWN) >= 1) - mi->scalingFunction[BLACK] = &ScaleKKBPs; - - 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] = &ScaleKQKRPs; - - 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] = &ScaleKRPsKQ; - - if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == Value(0)) + if (is_KBPsK(pos)) + mi->scalingFunction[WHITE] = &ScaleKBPsK[WHITE]; + + if (is_KBPsK(pos)) + mi->scalingFunction[BLACK] = &ScaleKBPsK[BLACK]; + + if (is_KQKRPs(pos)) + mi->scalingFunction[WHITE] = &ScaleKQKRPs[WHITE]; + + else if (is_KQKRPs(pos)) + mi->scalingFunction[BLACK] = &ScaleKQKRPs[BLACK]; + + if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == VALUE_ZERO) { if (pos.piece_count(BLACK, PAWN) == 0) { assert(pos.piece_count(WHITE, PAWN) >= 2); - mi->scalingFunction[WHITE] = &ScaleKPsK; + mi->scalingFunction[WHITE] = &ScaleKPsK[WHITE]; } else if (pos.piece_count(WHITE, PAWN) == 0) { assert(pos.piece_count(BLACK, PAWN) >= 2); - mi->scalingFunction[BLACK] = &ScaleKKPs; + mi->scalingFunction[BLACK] = &ScaleKPsK[BLACK]; } else if (pos.piece_count(WHITE, PAWN) == 1 && pos.piece_count(BLACK, PAWN) == 1) { // This is a special case because we set scaling functions // for both colors instead of only one. - mi->scalingFunction[WHITE] = &ScaleKPKPw; - mi->scalingFunction[BLACK] = &ScaleKPKPb; + mi->scalingFunction[WHITE] = &ScaleKPKP[WHITE]; + mi->scalingFunction[BLACK] = &ScaleKPKP[BLACK]; } } @@ -332,9 +334,9 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { // Second-degree polynomial material imbalance by Tord Romstad // - // We use NO_PIECE_TYPE as a place holder for the bishop pair "extended piece", + // We use PIECE_TYPE_NONE as a place holder for the bishop pair "extended piece", // this allow us to be more flexible in defining bishop pair bonuses. - for (pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; pt1++) + for (pt1 = PIECE_TYPE_NONE; pt1 <= QUEEN; pt1++) { pc = pieceCount[c][pt1]; if (!pc) @@ -342,7 +344,7 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { vv = LinearCoefficients[pt1]; - for (pt2 = NO_PIECE_TYPE; pt2 <= pt1; pt2++) + for (pt2 = PIECE_TYPE_NONE; pt2 <= pt1; pt2++) vv += pieceCount[c][pt2] * QuadraticCoefficientsSameColor[pt1][pt2] + pieceCount[them][pt2] * QuadraticCoefficientsOppositeColor[pt1][pt2]; @@ -378,11 +380,11 @@ EndgameFunctions::EndgameFunctions() { EndgameFunctions::~EndgameFunctions() { - for (map::iterator it = maps.first.begin(); it != maps.first.end(); ++it) - delete (*it).second; + for (EFMap::const_iterator it = maps.first.begin(); it != maps.first.end(); ++it) + delete it->second; - for (map::iterator it = maps.second.begin(); it != maps.second.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) { @@ -400,10 +402,10 @@ Key EndgameFunctions::buildKey(const string& keyCode) { if (keyCode[i] == 'K') upcase = !upcase; - s << char(upcase? toupper(keyCode[i]) : tolower(keyCode[i])); + s << char(upcase ? toupper(keyCode[i]) : tolower(keyCode[i])); } - s << 8 - keyCode.length() << "/8/8/8/8/8/8/8 w -"; - return Position(s.str()).get_material_key(); + s << 8 - keyCode.length() << "/8/8/8/8/8/8/8 w - -"; + return Position(s.str(), 0).get_material_key(); } const string EndgameFunctions::swapColors(const string& keyCode) { @@ -417,14 +419,15 @@ template void EndgameFunctions::add(const string& keyCode) { typedef typename T::Base F; + typedef map M; - get().insert(pair(buildKey(keyCode), new T(WHITE))); - get().insert(pair(buildKey(swapColors(keyCode)), new T(BLACK))); + 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); + typename map::const_iterator it = get().find(key); + return it != get().end() ? it->second : NULL; }