/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2008-2009 Marco Costalba
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
////
#include <cassert>
-#include <cstring>
+#include <sstream>
#include <map>
#include "material.h"
+using std::string;
////
//// Local definitions
namespace {
- const Value BishopPairMidgameBonus = Value(100);
- const Value BishopPairEndgameBonus = Value(100);
+ // Values modified by Joona Kiiski
+ const Value BishopPairMidgameBonus = Value(109);
+ const Value BishopPairEndgameBonus = Value(97);
Key KNNKMaterialKey, KKNNMaterialKey;
+ // Unmapped 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<KPsK> ScaleKPsK(WHITE), ScaleKKPs(BLACK);
+ ScalingFunction<KPKP> ScaleKPKPw(WHITE), ScaleKPKPb(BLACK);
}
+
////
//// Classes
////
class EndgameFunctions {
+ typedef EndgameEvaluationFunctionBase EF;
+ typedef EndgameScalingFunctionBase SF;
+
public:
EndgameFunctions();
- EndgameEvaluationFunction* getEEF(Key key) const;
- ScalingFunction* getESF(Key key, Color* c) const;
+ ~EndgameFunctions();
+ template<class T> T* get(Key key) const;
private:
- void add(Key k, EndgameEvaluationFunction* f);
- void add(Key k, Color c, ScalingFunction* f);
+ template<class T> void add(const string& keyCode);
- struct ScalingInfo
- {
- Color col;
- ScalingFunction* fun;
- };
+ static Key buildKey(const string& keyCode);
+ static const string swapColors(const string& keyCode);
- std::map<Key, EndgameEvaluationFunction*> EEFmap;
- std::map<Key, ScalingInfo> ESFmap;
+ std::map<Key, EF*> EEFmap;
+ std::map<Key, SF*> ESFmap;
+
+ // 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; }
};
{
std::cerr << "Failed to allocate " << (numOfEntries * sizeof(MaterialInfo))
<< " bytes for material hash table." << std::endl;
- exit(EXIT_FAILURE);
+ Application::exit_with_failure();
}
- clear();
}
MaterialInfoTable::~MaterialInfoTable() {
- delete [] entries;
delete funcs;
-}
-
-
-/// MaterialInfoTable::clear() clears a material hash table by setting
-/// all entries to 0.
-
-void MaterialInfoTable::clear() {
-
- memset(entries, 0, size * sizeof(MaterialInfo));
+ delete [] entries;
}
}
// Let's look if we have a specialized evaluation function for this
- // particular material configuration.
- if ((mi->evaluationFunction = funcs->getEEF(key)) != NULL)
+ // 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)
return mi;
else if ( pos.non_pawn_material(BLACK) == Value(0)
&& pos.piece_count(BLACK, PAWN) == 0
- && pos.non_pawn_material(WHITE) >= RookValueEndgame)
+ && pos.non_pawn_material(WHITE) >= RookValueMidgame)
{
mi->evaluationFunction = &EvaluateKXK;
return mi;
}
else if ( pos.non_pawn_material(WHITE) == Value(0)
&& pos.piece_count(WHITE, PAWN) == 0
- && pos.non_pawn_material(BLACK) >= RookValueEndgame)
+ && pos.non_pawn_material(BLACK) >= RookValueMidgame)
{
mi->evaluationFunction = &EvaluateKKX;
return mi;
// 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
+ // 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.
- Color c;
- ScalingFunction* sf;
+ EndgameScalingFunctionBase* sf;
- if ((sf = funcs->getESF(key, &c)) != NULL)
+ if ((sf = funcs->get<EndgameScalingFunctionBase>(key)) != NULL)
{
- mi->scalingFunction[c] = sf;
+ mi->scalingFunction[sf->color()] = sf;
return mi;
}
// Evaluate the material balance
+ Color c;
int sign;
Value egValue = Value(0);
Value mgValue = Value(0);
/// EndgameFunctions member definitions. This class is used to store the maps
-/// of end game and scaling functions that MaterialInfoTable will query for
+/// 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.
+/// 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::EndgameFunctions() {
- typedef Key ZM[2][8][16];
- const ZM& z = Position::zobMaterial;
-
- static const Color W = WHITE;
- static const Color B = BLACK;
-
- KNNKMaterialKey = z[W][KNIGHT][1] ^ z[W][KNIGHT][2];
- KKNNMaterialKey = z[B][KNIGHT][1] ^ z[B][KNIGHT][2];
-
- add(z[W][PAWN][1], &EvaluateKPK);
- add(z[B][PAWN][1], &EvaluateKKP);
-
- add(z[W][BISHOP][1] ^ z[W][KNIGHT][1], &EvaluateKBNK);
- add(z[B][BISHOP][1] ^ z[B][KNIGHT][1], &EvaluateKKBN);
- add(z[W][ROOK][1] ^ z[B][PAWN][1], &EvaluateKRKP);
- add(z[W][PAWN][1] ^ z[B][ROOK][1], &EvaluateKPKR);
- add(z[W][ROOK][1] ^ z[B][BISHOP][1], &EvaluateKRKB);
- add(z[W][BISHOP][1] ^ z[B][ROOK][1], &EvaluateKBKR);
- add(z[W][ROOK][1] ^ z[B][KNIGHT][1], &EvaluateKRKN);
- add(z[W][KNIGHT][1] ^ z[B][ROOK][1], &EvaluateKNKR);
- add(z[W][QUEEN][1] ^ z[B][ROOK][1], &EvaluateKQKR);
- add(z[W][ROOK][1] ^ z[B][QUEEN][1], &EvaluateKRKQ);
- add(z[W][BISHOP][2] ^ z[B][KNIGHT][1], &EvaluateKBBKN);
- add(z[W][KNIGHT][1] ^ z[B][BISHOP][2], &EvaluateKNKBB);
-
- add(z[W][KNIGHT][1] ^ z[W][PAWN][1], W, &ScaleKNPK);
- add(z[B][KNIGHT][1] ^ z[B][PAWN][1], B, &ScaleKKNP);
-
- add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[B][ROOK][1] , W, &ScaleKRPKR);
- add(z[W][ROOK][1] ^ z[B][ROOK][1] ^ z[B][PAWN][1] , B, &ScaleKRKRP);
- add(z[W][BISHOP][1] ^ z[W][PAWN][1] ^ z[B][BISHOP][1], W, &ScaleKBPKB);
- add(z[W][BISHOP][1] ^ z[B][BISHOP][1] ^ z[B][PAWN][1] , B, &ScaleKBKBP);
- add(z[W][BISHOP][1] ^ z[W][PAWN][1] ^ z[B][KNIGHT][1], W, &ScaleKBPKN);
- add(z[W][KNIGHT][1] ^ z[B][BISHOP][1] ^ z[B][PAWN][1] , B, &ScaleKNKBP);
-
- add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[W][PAWN][2] ^ z[B][ROOK][1] ^ z[B][PAWN][1], W, &ScaleKRPPKRP);
- add(z[W][ROOK][1] ^ z[W][PAWN][1] ^ z[B][ROOK][1] ^ z[B][PAWN][1] ^ z[B][PAWN][2], B, &ScaleKRPKRPP);
+ KNNKMaterialKey = buildKey("KNNK");
+ KKNNMaterialKey = buildKey("KKNN");
+
+ add<EvaluationFunction<KPK> >("KPK");
+ add<EvaluationFunction<KBNK> >("KBNK");
+ add<EvaluationFunction<KRKP> >("KRKP");
+ add<EvaluationFunction<KRKB> >("KRKB");
+ add<EvaluationFunction<KRKN> >("KRKN");
+ add<EvaluationFunction<KQKR> >("KQKR");
+ add<EvaluationFunction<KBBKN> >("KBBKN");
+
+ add<ScalingFunction<KNPK> >("KNPK");
+ add<ScalingFunction<KRPKR> >("KRPKR");
+ add<ScalingFunction<KBPKB> >("KBPKB");
+ add<ScalingFunction<KBPPKB> >("KBPPKB");
+ add<ScalingFunction<KBPKN> >("KBPKN");
+ add<ScalingFunction<KRPPKRP> >("KRPPKRP");
+ add<ScalingFunction<KRPPKRP> >("KRPPKRP");
}
-void EndgameFunctions::add(Key k, EndgameEvaluationFunction* f) {
+EndgameFunctions::~EndgameFunctions() {
+
+ for (std::map<Key, EF*>::iterator it = EEFmap.begin(); it != EEFmap.end(); ++it)
+ delete (*it).second;
- EEFmap.insert(std::pair<Key, EndgameEvaluationFunction*>(k, f));
+ for (std::map<Key, SF*>::iterator it = ESFmap.begin(); it != ESFmap.end(); ++it)
+ delete (*it).second;
}
-void EndgameFunctions::add(Key k, Color c, ScalingFunction* f) {
+Key EndgameFunctions::buildKey(const string& keyCode) {
- ScalingInfo s = {c, f};
- ESFmap.insert(std::pair<Key, ScalingInfo>(k, s));
+ assert(keyCode.length() > 0 && keyCode[0] == 'K');
+ assert(keyCode.length() < 8);
+
+ std::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.
+ for (size_t i = 0; i < keyCode.length(); i++)
+ {
+ if (keyCode[i] == 'K')
+ upcase = !upcase;
+
+ 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();
}
-EndgameEvaluationFunction* EndgameFunctions::getEEF(Key key) const {
+const string EndgameFunctions::swapColors(const string& keyCode) {
- std::map<Key, EndgameEvaluationFunction*>::const_iterator it(EEFmap.find(key));
- return (it != EEFmap.end() ? it->second : NULL);
+ // Build corresponding key for the opposite color: "KBPKN" -> "KNKBP"
+ size_t idx = keyCode.find("K", 1);
+ return keyCode.substr(idx) + keyCode.substr(0, idx);
}
-ScalingFunction* EndgameFunctions::getESF(Key key, Color* c) const {
+template<class T>
+void EndgameFunctions::add(const string& keyCode) {
+
+ 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)));
+}
- std::map<Key, ScalingInfo>::const_iterator it(ESFmap.find(key));
- if (it == ESFmap.end())
- return NULL;
+template<class T>
+T* EndgameFunctions::get(Key key) const {
- *c = it->second.col;
- return it->second.fun;
+ std::map<Key, T*>::const_iterator it(map<T>().find(key));
+ return (it != map<T>().end() ? it->second : NULL);
}