Use operator() instead of apply() in endgames

[stockfish] / src / endgame.h

diff --git a/src/endgame.h b/src/endgame.h
index a9634738bee0232c5c03117d62a21688a1a465cf..ca29c0b9d5cf46e2ea9c039675da665498bef849 100644 (file)
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -46,6 +46,7 @@ enum EndgameType {
 
 
   // Scaling functions
+  SCALE_FUNS,
 
   KBPsK,   // KB+pawns vs K
   KQKRPs,  // KQ vs KR+pawns
@@ -60,25 +61,30 @@ enum EndgameType {
 };
 
 
+/// Some magic to detect family type of endgame from its enum value
+
+template<bool> struct bool_to_type { typedef Value type; };
+template<> struct bool_to_type<true> { typedef ScaleFactor type; };
+template<EndgameType E> struct eg_family : public bool_to_type<(E > SCALE_FUNS)> {};
+
+
 /// Base and derived templates for endgame evaluation and scaling functions
 
 template<typename T>
 struct EndgameBase {
 
-  typedef EndgameBase<T> Base;
-
   virtual ~EndgameBase() {}
   virtual Color color() const = 0;
-  virtual T apply(const Position&) const = 0;
+  virtual T operator()(const Position&) const = 0;
 };
 
 
-template<typename T, EndgameType>
+template<EndgameType E, typename T = typename eg_family<E>::type>
 struct Endgame : public EndgameBase<T> {
 
-  explicit Endgame(Color c) : strongerSide(c), weakerSide(opposite_color(c)) {}
+  explicit Endgame(Color c) : strongerSide(c), weakerSide(flip(c)) {}
   Color color() const { return strongerSide; }
-  T apply(const Position&) const;
+  T operator()(const Position&) const;
 
 private:
   Color strongerSide, weakerSide;
@@ -92,20 +98,28 @@ private:
 struct Endgames {
 
   template<typename T>
-  struct EMap { typedef std::map<Key, EndgameBase<T>*> type; };
+  struct Map { typedef std::map<Key, EndgameBase<T>*> type; };
+
+  typedef Map<Value>::type M1;
+  typedef Map<ScaleFactor>::type M2;
 
   Endgames();
   ~Endgames();
-  template<typename T> EndgameBase<T>* get(Key key) const;
 
-private:
-  template<typename T, EndgameType E> void add(const std::string& keyCode);
+  template<typename T>
+  EndgameBase<T>* get(Key key) const {
 
-  // Here we store two maps, for evaluate and scaling functions...
-  std::pair<EMap<Value>::type, EMap<ScaleFactor>::type> maps;
+    typedef typename Map<T>::type M;
+    typename M::const_iterator it = map<M>().find(key);
+    return it != map<M>().end() ? it->second : NULL;
+  }
+
+private:
+  template<EndgameType E> void add(const std::string& keyCode);
+  template<typename M> const M& map() const;
 
-  // ...and here is the accessing template function
-  template<typename T> const typename EMap<T>::type& map() const;
+  M1 m1;
+  M2 m2;
 };
 
 #endif // !defined(ENDGAME_H_INCLUDED)