X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=ffc549ca6962bb637e9d23059bb991a76f792563;hp=0fce07b1d03ea28313253c8866a5d120ecdf46d9;hb=94b9c65e09b5d396bebb29b62d9979139b5fbdfa;hpb=bedf80a4c01ec5d265fc65114592761d37eeb85c diff --git a/src/material.cpp b/src/material.cpp index 0fce07b1..ffc549ca 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -57,6 +57,8 @@ namespace { 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. @@ -70,7 +72,7 @@ namespace { // 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; } @@ -113,21 +115,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; } //// @@ -167,7 +165,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,7 +181,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 & (size - 1)); MaterialInfo* mi = entries + index; // If mi->key matches the position's material hash key, it means that we @@ -204,14 +203,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[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. @@ -254,7 +254,7 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { else if (is_KQKRPs(pos)) 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) { @@ -334,7 +334,7 @@ MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { // // We use NO_PIECE_TYPE 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 +342,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 +378,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 +400,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 +417,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; }