X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmaterial.cpp;h=bd9d5e8a3e8d653b8d288ccc0f2dd2746e4cb41d;hp=0d38c37d30fff6f98594a6dbf4b3742414e800e0;hb=078354060ecb3f248cc1d719834073d46194d9d3;hpb=e6376d9b8daae0aa0dcda618ec6330bda2dcfaf7 diff --git a/src/material.cpp b/src/material.cpp index 0d38c37d..bd9d5e8a 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -23,7 +23,7 @@ //// #include -#include +#include #include #include "material.h" @@ -47,16 +47,18 @@ 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 } }; 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; } //// @@ -136,18 +134,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() { @@ -183,7 +181,7 @@ Phase MaterialInfoTable::game_phase(const Position& pos) { MaterialInfo* MaterialInfoTable::get_material_info(const Position& pos) { Key key = pos.get_material_key(); - unsigned index = unsigned(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 @@ -193,7 +191,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 @@ -256,7 +255,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) { @@ -290,10 +289,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,7 +335,7 @@ 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 = PIECE_TYPE_NONE; pt1 <= QUEEN; pt1++) { @@ -352,12 +353,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 +381,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 +403,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(), 0).get_material_key(); + fen += char(8 - keyCode.length() + '0'); + fen += "/8/8/8/8/8/8/8 w - -"; + return Position(fen, 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 +421,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; }