kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 16:23:09 +00:00
Code Issues Releases Wiki Activity

Usual material.cpp small touches

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-08-08 12:38:30 +01:00
parent e6376d9b8d
commit f26e0fec64
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/material.cpp
View file

@ -57,6 +57,8 @@ namespace {
typedef EndgameEvaluationFunctionBase EF; typedef EndgameEvaluationFunctionBase EF;
typedef EndgameScalingFunctionBase SF; typedef EndgameScalingFunctionBase SF;
typedef map<Key, EF*> EFMap;
typedef map<Key, SF*> SFMap;
// Endgame evaluation and scaling functions accessed direcly and not through // Endgame evaluation and scaling functions accessed direcly and not through
// the function maps because correspond to more then one material hash key. // the function maps because correspond to more then one material hash key.
@ -113,21 +115,17 @@ private:
static Key buildKey(const string& keyCode); static Key buildKey(const string& keyCode);
static const string swapColors(const string& keyCode); static const string swapColors(const string& keyCode);
// Here we store two maps, for evaluate and scaling functions // Here we store two maps, for evaluate and scaling functions...
pair<map<Key, EF*>, map<Key, SF*> > maps; pair<EFMap, SFMap> maps;
// Maps accessing functions returning const and non-const references // ...and here is the accessing template function
template<typename T> const map<Key, T*>& get() const { return maps.first; } template<typename T> const map<Key, T*>& get() const;
template<typename T> map<Key, T*>& get() { return maps.first; }
}; };
// Explicit specializations of a member function shall be declared in // Explicit specializations of a member function shall be declared in
// the namespace of which the class template is a member. // the namespace of which the class template is a member.
template<> const map<Key, SF*>& template<> const EFMap& EndgameFunctions::get<EF>() const { return maps.first; }
EndgameFunctions::get<SF>() const { return maps.second; } template<> const SFMap& EndgameFunctions::get<SF>() const { return maps.second; }
template<> map<Key, SF*>&
EndgameFunctions::get<SF>() { return maps.second; }
//// ////
@ -380,11 +378,11 @@ EndgameFunctions::EndgameFunctions() {
EndgameFunctions::~EndgameFunctions() { EndgameFunctions::~EndgameFunctions() {
for (map<Key, EF*>::iterator it = maps.first.begin(); it != maps.first.end(); ++it) for (EFMap::const_iterator it = maps.first.begin(); it != maps.first.end(); ++it)
delete (*it).second; delete it->second;
for (map<Key, SF*>::iterator it = maps.second.begin(); it != maps.second.end(); ++it) for (SFMap::const_iterator it = maps.second.begin(); it != maps.second.end(); ++it)
delete (*it).second; delete it->second;
} }
Key EndgameFunctions::buildKey(const string& keyCode) { Key EndgameFunctions::buildKey(const string& keyCode) {
@ -419,14 +417,15 @@ template<class T>
void EndgameFunctions::add(const string& keyCode) { void EndgameFunctions::add(const string& keyCode) {
typedef typename T::Base F; typedef typename T::Base F;
typedef map<Key, F*> M;
get<F>().insert(pair<Key, F*>(buildKey(keyCode), new T(WHITE))); const_cast<M&>(get<F>()).insert(pair<Key, F*>(buildKey(keyCode), new T(WHITE)));
get<F>().insert(pair<Key, F*>(buildKey(swapColors(keyCode)), new T(BLACK))); const_cast<M&>(get<F>()).insert(pair<Key, F*>(buildKey(swapColors(keyCode)), new T(BLACK)));
} }
template<class T> template<class T>
T* EndgameFunctions::get(Key key) const { T* EndgameFunctions::get(Key key) const {
typename map<Key, T*>::const_iterator it(get<T>().find(key)); typename map<Key, T*>::const_iterator it = get<T>().find(key);
return (it != get<T>().end() ? it->second : NULL); return it != get<T>().end() ? it->second : NULL;
} }