X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fendgame.h;h=453d8b29d47d98780fb8a04bb00da8efed95ff8c;hp=a9634738bee0232c5c03117d62a21688a1a465cf;hb=f7d8ea3866c26df10617e97513e906d1f5a5b833;hpb=3b67636f0ecb2ec7e61e9f4adf02a7d4cae89f0a

diff --git a/src/endgame.h b/src/endgame.h
index a9634738..453d8b29 100644
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,11 +17,14 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined(ENDGAME_H_INCLUDED)
+#ifndef ENDGAME_H_INCLUDED
 #define ENDGAME_H_INCLUDED
 
-#include <string>
 #include <map>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
 
 #include "position.h"
 #include "types.h"
@@ -33,79 +36,85 @@ enum EndgameType {
 
   // Evaluation functions
 
+  KNNK,  // KNN vs K
   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
+  KQKP,  // KQ vs KP
   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
+  SCALING_FUNCTIONS,
 
-  KBPsK,   // KB+pawns vs K
-  KQKRPs,  // KQ vs KR+pawns
+  KBPsK,   // KB and pawns vs K
+  KQKRPs,  // KQ vs KR and pawns
   KRPKR,   // KRP vs KR
+  KRPKB,   // KRP vs KB
   KRPPKRP, // KRPP vs KRP
-  KPsK,    // King and pawns vs king
+  KPsK,    // K and pawns vs K
   KBPKB,   // KBP vs KB
   KBPPKB,  // KBPP vs KB
   KBPKN,   // KBP vs KN
   KNPK,    // KNP vs K
+  KNPKB,   // KNP vs KB
   KPKP     // KP vs KP
 };
 
 
+/// Endgame functions can be of two types depending on whether they return a
+/// Value or a ScaleFactor.
+template<EndgameType E>
+using eg_fun = std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>;
+
+
 /// 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 Color strong_side() const = 0;
+  virtual T operator()(const Position&) const = 0;
 };
 
 
-template<typename T, EndgameType>
+template<EndgameType E, typename T = typename eg_fun<E>::type>
 struct Endgame : public EndgameBase<T> {
 
-  explicit Endgame(Color c) : strongerSide(c), weakerSide(opposite_color(c)) {}
-  Color color() const { return strongerSide; }
-  T apply(const Position&) const;
+  explicit Endgame(Color c) : strongSide(c), weakSide(~c) {}
+  Color strong_side() const { return strongSide; }
+  T operator()(const Position&) const;
 
 private:
-  Color strongerSide, weakerSide;
+  const Color strongSide, weakSide;
 };
 
 
-/// 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.
+/// The Endgames class stores the pointers to endgame evaluation and scaling
+/// base objects in two std::map. We use polymorphism to invoke the actual
+/// endgame function by calling its virtual operator().
 
-struct Endgames {
+class Endgames {
 
-  template<typename T>
-  struct EMap { typedef std::map<Key, EndgameBase<T>*> type; };
+  template<typename T> using Map = std::map<Key, std::unique_ptr<T>>;
 
-  Endgames();
-  ~Endgames();
-  template<typename T> EndgameBase<T>* get(Key key) const;
+  template<EndgameType E, typename T = EndgameBase<typename eg_fun<E>::type>>
+  void add(const std::string& code);
 
-private:
-  template<typename T, EndgameType E> void add(const std::string& keyCode);
+  template<typename T, int I = std::is_same<T, EndgameBase<ScaleFactor>>::value>
+  Map<T>& map() { return std::get<I>(maps); }
 
-  // Here we store two maps, for evaluate and scaling functions...
-  std::pair<EMap<Value>::type, EMap<ScaleFactor>::type> maps;
+  std::pair<Map<EndgameBase<Value>>, Map<EndgameBase<ScaleFactor>>> maps;
+
+public:
+  Endgames();
 
-  // ...and here is the accessing template function
-  template<typename T> const typename EMap<T>::type& map() const;
+  template<typename T, typename E = EndgameBase<T>> E* probe(Key key)
+  { return map<E>().count(key) ? map<E>()[key].get() : nullptr; }
 };
 
-#endif // !defined(ENDGAME_H_INCLUDED)
+#endif // #ifndef ENDGAME_H_INCLUDED