X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=cc90c2f9f620dbdc35d1571d1711e7f204cd42a5;hp=d34839808b3360a33848ff20dd0fd73b802a8af2;hb=d4b92ae9a094e1b388e3d70789a0db9a9c69cbdf;hpb=fe7e0a425eef79c56ff27a48ea4f26f32d880c6e diff --git a/src/material.cpp b/src/material.cpp index d3483980..cc90c2f9 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -23,7 +23,7 @@ //// #include -#include +#include #include #include "material.h" @@ -47,32 +47,34 @@ namespace { const int LinearCoefficients[6] = { 1617, -162, -1172, -190, 105, 26 }; - const int QuadraticCoefficientsSameColor[][6] = { + const int QuadraticCoefficientsSameColor[][8] = { { 7, 7, 7, 7, 7, 7 }, { 39, 2, 7, 7, 7, 7 }, { 35, 271, -4, 7, 7, 7 }, { 7, 25, 4, 7, 7, 7 }, { -27, -2, 46, 100, 56, 7 }, { 58, 29, 83, 148, -3, -25 } }; - const int QuadraticCoefficientsOppositeColor[][6] = { + const int QuadraticCoefficientsOppositeColor[][8] = { { 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(0) + return pos.non_pawn_material(Them) == VALUE_ZERO && pos.piece_count(Them, PAWN) == 0 - && pos.non_pawn_material(Us) >= RookValueMidgame; + && pos.non_pawn_material(Us) >= RookValueMidgame; } template bool is_KBPsK(const Position& pos) { @@ -113,49 +115,25 @@ 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; } //// //// Functions //// -/// MaterialInfoTable c'tor and d'tor, called once by each thread - -MaterialInfoTable::MaterialInfoTable(unsigned int numOfEntries) { - - size = numOfEntries; - entries = new MaterialInfo[size]; - funcs = new EndgameFunctions(); - - if (!entries || !funcs) - { - cerr << "Failed to allocate " << numOfEntries * sizeof(MaterialInfo) - << " bytes for material hash table." << endl; - Application::exit_with_failure(); - } -} - -MaterialInfoTable::~MaterialInfoTable() { - - delete funcs; - delete [] entries; -} - +MaterialInfoTable::MaterialInfoTable() { funcs = new EndgameFunctions(); } +MaterialInfoTable::~MaterialInfoTable() { delete funcs; } /// MaterialInfoTable::game_phase() calculates the phase given the current /// position. Because the phase is strictly a function of the material, it @@ -167,7 +145,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)); @@ -182,8 +161,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); - MaterialInfo* mi = entries + index; + MaterialInfo* mi = find(key); // If mi->key matches the position's material hash key, it means that we // have analysed this material configuration before, and we can simply @@ -192,7 +170,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 @@ -204,14 +183,15 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { if ((mi->evaluationFunction = funcs->get(key)) != NULL) return mi; - else if (is_KXK(pos) || is_KXK(pos)) + if (is_KXK(pos) || is_KXK(pos)) { - mi->evaluationFunction = is_KXK(pos) ? &EvaluateKXK : &EvaluateKKX; + mi->evaluationFunction = is_KXK(pos) ? &EvaluateKXK[WHITE] : &EvaluateKXK[BLACK]; 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. @@ -221,7 +201,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; } } @@ -229,10 +209,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) @@ -245,35 +223,35 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { // distribution. Should be probed after the specialized ones. // Note that these ones don't return after setting the function. if (is_KBPsK(pos)) - mi->scalingFunction[WHITE] = &ScaleKBPsK; + mi->scalingFunction[WHITE] = &ScaleKBPsK[WHITE]; if (is_KBPsK(pos)) - mi->scalingFunction[BLACK] = &ScaleKKBPs; + mi->scalingFunction[BLACK] = &ScaleKBPsK[BLACK]; if (is_KQKRPs(pos)) - mi->scalingFunction[WHITE] = &ScaleKQKRPs; + mi->scalingFunction[WHITE] = &ScaleKQKRPs[WHITE]; else if (is_KQKRPs(pos)) - mi->scalingFunction[BLACK] = &ScaleKRPsKQ; + mi->scalingFunction[BLACK] = &ScaleKQKRPs[BLACK]; - if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == Value(0)) + 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]; } } @@ -290,10 +268,12 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { } // Evaluate the material balance - const int pieceCount[2][6] = { { pos.piece_count(WHITE, BISHOP) > 1, pos.piece_count(WHITE, PAWN), pos.piece_count(WHITE, KNIGHT), - pos.piece_count(WHITE, BISHOP), pos.piece_count(WHITE, ROOK), pos.piece_count(WHITE, QUEEN) }, - { pos.piece_count(BLACK, BISHOP) > 1, pos.piece_count(BLACK, PAWN), pos.piece_count(BLACK, KNIGHT), - pos.piece_count(BLACK, BISHOP), pos.piece_count(BLACK, ROOK), pos.piece_count(BLACK, QUEEN) } }; + const int pieceCount[2][8] = { + { pos.piece_count(WHITE, BISHOP) > 1, pos.piece_count(WHITE, PAWN), pos.piece_count(WHITE, KNIGHT), + pos.piece_count(WHITE, BISHOP), pos.piece_count(WHITE, ROOK), pos.piece_count(WHITE, QUEEN) }, + { pos.piece_count(BLACK, BISHOP) > 1, pos.piece_count(BLACK, PAWN), pos.piece_count(BLACK, KNIGHT), + pos.piece_count(BLACK, BISHOP), pos.piece_count(BLACK, ROOK), pos.piece_count(BLACK, QUEEN) } }; + Color c, them; int sign, pt1, pt2, pc; int v, vv, matValue = 0; @@ -334,9 +314,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) @@ -344,7 +324,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]; @@ -352,12 +332,12 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { } matValue += sign * v; } - mi->value = int16_t(matValue / 16); + mi->value = (int16_t)(matValue / 16); return mi; } -/// EndgameFunctions member definitions. +/// EndgameFunctions member definitions EndgameFunctions::EndgameFunctions() { @@ -380,19 +360,19 @@ 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) { - assert(keyCode.length() > 0 && keyCode[0] == 'K'); - assert(keyCode.length() < 8); + assert(keyCode.length() > 0 && keyCode.length() < 8); + assert(keyCode[0] == 'K'); - stringstream s; + string fen; bool upcase = false; // Build up a fen string with the given pieces, note that @@ -402,16 +382,17 @@ Key EndgameFunctions::buildKey(const string& keyCode) { if (keyCode[i] == 'K') upcase = !upcase; - s << char(upcase? toupper(keyCode[i]) : tolower(keyCode[i])); + fen += 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(); + fen += char(8 - keyCode.length() + '0'); + fen += "/8/8/8/8/8/8/8 w - -"; + return Position(fen, false, 0).get_material_key(); } const string EndgameFunctions::swapColors(const string& keyCode) { // Build corresponding key for the opposite color: "KBPKN" -> "KNKBP" - size_t idx = keyCode.find("K", 1); + size_t idx = keyCode.find('K', 1); return keyCode.substr(idx) + keyCode.substr(0, idx); } @@ -419,14 +400,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; }