Better use STL algorithms in Endgame functions

[stockfish] / src / endgame.h

diff --git a/src/endgame.h b/src/endgame.h
index e40b4050756fee4b2fb8489b1a599ae6004aba43..a5e4efecafea8831c0bc4ee032ddc5c5aa5af6c8 100644 (file)
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -20,8 +20,8 @@
 #if !defined(ENDGAME_H_INCLUDED)
 #define ENDGAME_H_INCLUDED
 
-#include <string>
 #include <map>
+#include <string>
 
 #include "position.h"
 #include "types.h"
@@ -32,6 +32,7 @@
 enum EndgameType {
 
   // Evaluation functions
+
   KXK,   // Generic "mate lone king" eval
   KBNK,  // KBN vs K
   KPK,   // KP vs K
@@ -43,7 +44,10 @@ enum EndgameType {
   KNNK,  // KNN vs K
   KmmKm, // K and two minors vs K and one or two minors
 
+
   // Scaling functions
+  SCALE_FUNS,
+
   KBPsK,   // KB+pawns vs K
   KQKRPs,  // KQ vs KR+pawns
   KRPKR,   // KRP vs KR
@@ -57,53 +61,60 @@ enum EndgameType {
 };
 
 
-/// Base and derived template class for endgame evaluation and scaling functions
+/// 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;
-
-  EndgameBase(Color c) : strongerSide(c), weakerSide(opposite_color(c)) {}
   virtual ~EndgameBase() {}
-  virtual T apply(const Position&) const = 0;
-  Color color() const { return strongerSide; }
-
-protected:
-  Color strongerSide, weakerSide;
+  virtual Color color() 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): EndgameBase<T>(c) {}
-  T apply(const Position&) const;
+  explicit Endgame(Color c) : strongerSide(c), weakerSide(flip(c)) {}
+  Color color() const { return strongerSide; }
+  T operator()(const Position&) const;
+
+private:
+  Color strongerSide, weakerSide;
 };
 
 
 /// Endgames class stores in two std::map the pointers to endgame evaluation
 /// and scaling base objects. Then we use polymorphism to invoke the actual
-/// endgame function calling its apply() method that is virtual.
+/// endgame function calling its operator() method that is virtual.
 
 class Endgames {
 
-  typedef std::map<Key, EndgameBase<Value>*> EFMap;
-  typedef std::map<Key, EndgameBase<ScaleFactor>*> SFMap;
+  typedef std::map<Key, EndgameBase<Value>*> M1;
+  typedef std::map<Key, EndgameBase<ScaleFactor>*> M2;
+
+  M1 m1;
+  M2 m2;
+
+  M1& map(Value*) { return m1; }
+  M2& map(ScaleFactor*) { return m2; }
+
+  template<EndgameType E> void add(const std::string& code);
 
 public:
   Endgames();
   ~Endgames();
-  template<class T> T* get(Key key) const;
-
-private:
-  template<class T> void add(const std::string& keyCode);
-
-  // Here we store two maps, for evaluate and scaling functions...
-  std::pair<EFMap, SFMap> maps;
 
-  // ...and here is the accessing template function
-  template<typename T> const std::map<Key, T*>& get() const;
+  template<typename T> EndgameBase<T>* get(Key key) {
+    return map((T*)0).count(key) ? map((T*)0)[key] : NULL;
+  }
 };
 
 #endif // !defined(ENDGAME_H_INCLUDED)