#include "material.h"
-using std::string;
+using namespace std;
+
////
//// Local definitions
namespace {
- // Values modified by Joona Kiiski
- const Value BishopPairMidgameBonus = Value(109);
- const Value BishopPairEndgameBonus = Value(97);
+ // Polynomial material balance parameters
+ const Value RedundantQueenPenalty = Value(320);
+ const Value RedundantRookPenalty = Value(554);
+ const int LinearCoefficients[6] = { 1617, -162, -1172, -190, 105, 26 };
+
+ const int QuadraticCoefficientsSameColor[][6] = {
+ { 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 } };
- Key KNNKMaterialKey, KKNNMaterialKey;
+ const int QuadraticCoefficientsOppositeColor[][6] = {
+ { 0, 0, 0, 0, 0, 0 }, { -4, 0, 0, 0, 0, 0 }, { -31, 21, 0, 0, 0, 0 },
+ { 16, 23, -2, 0, 0, 0 }, { 9, -1, -18, -63, 0, 0 }, { 65, 60, -38, 110, 130, 0 } };
- // Unmapped endgame evaluation and scaling functions, these
+ // Named endgame evaluation and scaling functions, these
// are accessed direcly and not through the function maps.
EvaluationFunction<KmmKm> EvaluateKmmKm(WHITE);
EvaluationFunction<KXK> EvaluateKXK(WHITE), EvaluateKKX(BLACK);
- ScalingFunction<KBPK> ScaleKBPK(WHITE), ScaleKKBP(BLACK);
- ScalingFunction<KQKRP> ScaleKQKRP(WHITE), ScaleKRPKQ(BLACK);
+ ScalingFunction<KBPsK> ScaleKBPsK(WHITE), ScaleKKBPs(BLACK);
+ ScalingFunction<KQKRPs> ScaleKQKRPs(WHITE), ScaleKRPsKQ(BLACK);
ScalingFunction<KPsK> ScaleKPsK(WHITE), ScaleKKPs(BLACK);
ScalingFunction<KPKP> ScaleKPKPw(WHITE), ScaleKPKPb(BLACK);
+
+ typedef EndgameEvaluationFunctionBase EF;
+ typedef EndgameScalingFunctionBase SF;
}
//// Classes
////
-
-/// See header for a class description. It is declared here to avoid
-/// to include <map> in the header file.
+/// EndgameFunctions class stores endgame evaluation and scaling functions
+/// in two std::map. Because STL library is not guaranteed to be thread
+/// safe even for read access, the maps, although with identical content,
+/// are replicated for each thread. This is faster then using locks.
class EndgameFunctions {
-
- typedef EndgameEvaluationFunctionBase EF;
- typedef EndgameScalingFunctionBase SF;
-
public:
EndgameFunctions();
~EndgameFunctions();
static Key buildKey(const string& keyCode);
static const string swapColors(const string& keyCode);
- std::map<Key, EF*> EEFmap;
- std::map<Key, SF*> ESFmap;
+ // Here we store two maps, for evaluate and scaling functions
+ pair<map<Key, EF*>, map<Key, SF*> > maps;
- // Maps accessing functions for const and non-const references
- template<typename T> const std::map<Key, T*>& map() const { return EEFmap; }
- template<> const std::map<Key, SF*>& map<SF>() const { return ESFmap; }
- template<typename T> std::map<Key, T*>& map() { return EEFmap; }
- template<> std::map<Key, SF*>& map<SF>() { return ESFmap; }
+ // Maps accessing functions returning const and non-const references
+ template<typename T> const map<Key, T*>& get() const { return maps.first; }
+ template<typename T> map<Key, T*>& get() { return maps.first; }
};
+// Explicit specializations of a member function shall be declared in
+// the namespace of which the class template is a member.
+template<> const map<Key, SF*>&
+EndgameFunctions::get<SF>() const { return maps.second; }
+
+template<> map<Key, SF*>&
+EndgameFunctions::get<SF>() { return maps.second; }
+
////
//// Functions
////
-
-/// Constructor for the MaterialInfoTable class
+/// 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)
{
- std::cerr << "Failed to allocate " << (numOfEntries * sizeof(MaterialInfo))
- << " bytes for material hash table." << std::endl;
+ cerr << "Failed to allocate " << numOfEntries * sizeof(MaterialInfo)
+ << " bytes for material hash table." << endl;
Application::exit_with_failure();
}
}
-
-/// Destructor for the MaterialInfoTable class
-
MaterialInfoTable::~MaterialInfoTable() {
delete funcs;
mi->clear();
mi->key = key;
- // 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;
- }
-
// Let's look if we have a specialized evaluation function for this
// particular material configuration. First we look for a fixed
// configuration one, then a generic one if previous search failed.
- if ((mi->evaluationFunction = funcs->get<EndgameEvaluationFunctionBase>(key)) != NULL)
+ if ((mi->evaluationFunction = funcs->get<EF>(key)) != NULL)
return mi;
else if ( pos.non_pawn_material(BLACK) == Value(0)
&& pos.rooks() == EmptyBoardBB
&& pos.queens() == EmptyBoardBB)
{
- // Minor piece endgame with at least one minor piece per side,
- // and no pawns.
+ // Minor piece endgame with at least one minor piece per side and
+ // no pawns. Note that the case KmmK is already handled by KXK.
assert(pos.knights(WHITE) | pos.bishops(WHITE));
assert(pos.knights(BLACK) | pos.bishops(BLACK));
// 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.
- EndgameScalingFunctionBase* sf;
+ SF* sf;
- if ((sf = funcs->get<EndgameScalingFunctionBase>(key)) != NULL)
+ if ((sf = funcs->get<SF>(key)) != NULL)
{
mi->scalingFunction[sf->color()] = sf;
return mi;
}
+ // 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] = &ScaleKBPK;
+ 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] = &ScaleKKBP;
+ 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] = &ScaleKQKRP;
+ 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] = &ScaleKRPKQ;
+ mi->scalingFunction[BLACK] = &ScaleKRPsKQ;
if (pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) == Value(0))
{
}
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;
}
}
// Evaluate the material balance
-
- Color c;
+ 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) } };
+ Color c, them;
int sign;
- Value egValue = Value(0);
- Value mgValue = Value(0);
+ int matValue = 0;
for (c = WHITE, sign = 1; c <= BLACK; c++, sign = -sign)
{
}
}
- // 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
- // formula is taken from Larry Kaufman's paper "The Evaluation of Material
- // Imbalances in Chess":
+ // Redundancy of major pieces, formula based on Kaufman's paper
+ // "The Evaluation of Material Imbalances in Chess"
// http://mywebpages.comcast.net/danheisman/Articles/evaluation_of_material_imbalance.htm
- mgValue += sign * Value(pos.piece_count(c, KNIGHT)*(pos.piece_count(c, PAWN)-5)*16);
- egValue += sign * Value(pos.piece_count(c, KNIGHT)*(pos.piece_count(c, PAWN)-5)*16);
+ if (pieceCount[c][ROOK] >= 1)
+ matValue -= sign * ((pieceCount[c][ROOK] - 1) * RedundantRookPenalty + pieceCount[c][QUEEN] * RedundantQueenPenalty);
+
+ them = opposite_color(c);
- // Redundancy of major pieces, again based on Kaufman's paper:
- if (pos.piece_count(c, ROOK) >= 1)
+ // Second-degree polynomial material imbalance by Tord Romstad
+ //
+ // 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 (int pt1 = NO_PIECE_TYPE; pt1 <= QUEEN; pt1++)
{
- Value v = Value((pos.piece_count(c, ROOK) - 1) * 32 + pos.piece_count(c, QUEEN) * 16);
- mgValue -= sign * v;
- egValue -= sign * v;
+ int c1 = sign * pieceCount[c][pt1];
+ if (!c1)
+ continue;
+
+ matValue += c1 * LinearCoefficients[pt1];
+
+ for (int pt2 = NO_PIECE_TYPE; pt2 <= pt1; pt2++)
+ {
+ matValue += c1 * pieceCount[c][pt2] * QuadraticCoefficientsSameColor[pt1][pt2];
+ matValue += c1 * pieceCount[them][pt2] * QuadraticCoefficientsOppositeColor[pt1][pt2];
+ }
}
}
- mi->mgValue = int16_t(mgValue);
- mi->egValue = int16_t(egValue);
+ mi->value = int16_t(matValue / 16);
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 needed
-/// because std::map is not guaranteed to be thread-safe even if accessed
-/// only for a lookup.
+/// EndgameFunctions member definitions.
EndgameFunctions::EndgameFunctions() {
- KNNKMaterialKey = buildKey("KNNK");
- KKNNMaterialKey = buildKey("KKNN");
-
+ add<EvaluationFunction<KNNK> >("KNNK");
add<EvaluationFunction<KPK> >("KPK");
add<EvaluationFunction<KBNK> >("KBNK");
add<EvaluationFunction<KRKP> >("KRKP");
EndgameFunctions::~EndgameFunctions() {
- for (std::map<Key, EF*>::iterator it = EEFmap.begin(); it != EEFmap.end(); ++it)
+ for (map<Key, EF*>::iterator it = maps.first.begin(); it != maps.first.end(); ++it)
delete (*it).second;
- for (std::map<Key, SF*>::iterator it = ESFmap.begin(); it != ESFmap.end(); ++it)
+ for (map<Key, SF*>::iterator it = maps.second.begin(); it != maps.second.end(); ++it)
delete (*it).second;
}
assert(keyCode.length() > 0 && keyCode[0] == 'K');
assert(keyCode.length() < 8);
- std::stringstream s;
+ stringstream s;
bool upcase = false;
- // Build up a fen substring with the given pieces, note
- // that the fen string could be of an illegal position.
+ // Build up a fen string with the given pieces, note that
+ // the fen string could be of an illegal position.
for (size_t i = 0; i < keyCode.length(); i++)
{
if (keyCode[i] == 'K')
typedef typename T::Base F;
- map<F>().insert(std::pair<Key, F*>(buildKey(keyCode), new T(WHITE)));
- map<F>().insert(std::pair<Key, F*>(buildKey(swapColors(keyCode)), new T(BLACK)));
+ get<F>().insert(pair<Key, F*>(buildKey(keyCode), new T(WHITE)));
+ get<F>().insert(pair<Key, F*>(buildKey(swapColors(keyCode)), new T(BLACK)));
}
template<class T>
T* EndgameFunctions::get(Key key) const {
- std::map<Key, T*>::const_iterator it(map<T>().find(key));
- return (it != map<T>().end() ? it->second : NULL);
+ typename map<Key, T*>::const_iterator it(get<T>().find(key));
+ return (it != get<T>().end() ? it->second : NULL);
}
projects / stockfish / blobdiff