Use operator() instead of apply() in endgames

[stockfish] / src / endgame.h

diff --git a/src/endgame.h b/src/endgame.h
index 89b5ca4dab85fcd9b1024495b873e0973d1a8dc3..ca29c0b9d5cf46e2ea9c039675da665498bef849 100644 (file)
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -17,89 +17,109 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(ENDGAME_H_INCLUDED)
 #define ENDGAME_H_INCLUDED
 
-////
-//// Includes
-////
+#include <string>
+#include <map>
 
 #include "position.h"
-#include "value.h"
+#include "types.h"
 
 
-////
-//// Types
-////
+/// EndgameType lists all supported endgames
 
 enum EndgameType {
 
-    // Evaluation functions
-    KXK,   // Generic "mate lone king" eval
-    KBNK,  // KBN vs K
-    KPK,   // KP vs K
-    KRKP,  // KR vs KP
-    KRKB,  // KR vs KB
-    KRKN,  // KR vs KN
-    KQKR,  // KQ vs KR
-    KBBKN, // KBB vs KN
-    KNNK,  // KNN vs K
-    KmmKm, // K and two minors vs K and one or two minors
-
-    // Scaling functions
-    KBPsK,   // KB+pawns vs K
-    KQKRPs,  // KQ vs KR+pawns
-    KRPKR,   // KRP vs KR
-    KRPPKRP, // KRPP vs KRP
-    KPsK,    // King and pawns vs king
-    KBPKB,   // KBP vs KB
-    KBPPKB,  // KBPP vs KB
-    KBPKN,   // KBP vs KN
-    KNPK,    // KNP vs K
-    KPKP     // KP vs KP
+  // Evaluation functions
+
+  KXK,   // Generic "mate lone king" eval
+  KBNK,  // KBN vs K
+  KPK,   // KP vs K
+  KRKP,  // KR vs KP
+  KRKB,  // KR vs KB
+  KRKN,  // KR vs KN
+  KQKR,  // KQ vs KR
+  KBBKN, // KBB vs KN
+  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
+  KRPPKRP, // KRPP vs KRP
+  KPsK,    // King and pawns vs king
+  KBPKB,   // KBP vs KB
+  KBPPKB,  // KBPP vs KB
+  KBPKN,   // KBP vs KN
+  KNPK,    // KNP vs K
+  KPKP     // KP vs KP
 };
 
-/// Template abstract base class for all special endgame 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>
-class EndgameFunctionBase {
-public:
-  EndgameFunctionBase(Color c) : strongerSide(c), weakerSide(opposite_color(c)) {}
-  virtual ~EndgameFunctionBase() {}
-  virtual T apply(const Position&) const = 0;
+struct EndgameBase {
+
+  virtual ~EndgameBase() {}
+  virtual Color color() const = 0;
+  virtual T operator()(const Position&) const = 0;
+};
+
+
+template<EndgameType E, typename T = typename eg_family<E>::type>
+struct Endgame : public EndgameBase<T> {
+
+  explicit Endgame(Color c) : strongerSide(c), weakerSide(flip(c)) {}
   Color color() const { return strongerSide; }
+  T operator()(const Position&) const;
 
-protected:
+private:
   Color strongerSide, weakerSide;
 };
 
-typedef EndgameFunctionBase<Value> EndgameEvaluationFunctionBase;
-typedef EndgameFunctionBase<ScaleFactor> EndgameScalingFunctionBase;
 
+/// 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.
 
-/// Templates subclass for various concrete endgames
+struct Endgames {
 
-template<EndgameType>
-struct EvaluationFunction : public EndgameEvaluationFunctionBase {
-  typedef EndgameEvaluationFunctionBase Base;
-  explicit EvaluationFunction(Color c): EndgameEvaluationFunctionBase(c) {}
-  Value apply(const Position&) const;
-};
+  template<typename T>
+  struct Map { typedef std::map<Key, EndgameBase<T>*> type; };
 
-template<EndgameType>
-struct ScalingFunction : public EndgameScalingFunctionBase {
-  typedef EndgameScalingFunctionBase Base;
-  explicit ScalingFunction(Color c) : EndgameScalingFunctionBase(c) {}
-  ScaleFactor apply(const Position&) const;
-};
+  typedef Map<Value>::type M1;
+  typedef Map<ScaleFactor>::type M2;
+
+  Endgames();
+  ~Endgames();
 
+  template<typename T>
+  EndgameBase<T>* get(Key key) const {
 
-////
-//// Prototypes
-////
+    typedef typename Map<T>::type M;
+    typename M::const_iterator it = map<M>().find(key);
+    return it != map<M>().end() ? it->second : NULL;
+  }
 
-extern void init_bitbases();
+private:
+  template<EndgameType E> void add(const std::string& keyCode);
+  template<typename M> const M& map() const;
 
+  M1 m1;
+  M2 m2;
+};
 
 #endif // !defined(ENDGAME_H_INCLUDED)