X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fendgame.h;h=5f6b4bbba09d044acf7db0bf93ad28e48b9fafec;hp=e40b4050756fee4b2fb8489b1a599ae6004aba43;hb=ca14345ba26fc40e1039029659f57028f510502f;hpb=b5d5646c840d63710552fdaf2521a054dd3b8a18

diff --git a/src/endgame.h b/src/endgame.h
index e40b4050..5f6b4bbb 100644
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -1,7 +1,8 @@
 /*
   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
+  Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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 +18,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"
@@ -32,78 +36,90 @@
 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
-  KBPsK,   // KB+pawns vs K
-  KQKRPs,  // KQ vs KR+pawns
+  SCALING_FUNCTIONS,
+
+  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
 };
 
 
-/// Base and derived template class for endgame evaluation and scaling functions
+/// Endgame functions can be of two types depending on whether they return a
+/// Value or a ScaleFactor.
+template<EndgameType E> using
+eg_type = typename std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>::type;
 
-template<typename T>
-struct EndgameBase {
 
-  typedef EndgameBase<T> Base;
+/// Base and derived templates for endgame evaluation and scaling functions
 
-  EndgameBase(Color c) : strongerSide(c), weakerSide(opposite_color(c)) {}
-  virtual ~EndgameBase() {}
-  virtual T apply(const Position&) const = 0;
-  Color color() const { return strongerSide; }
+template<typename T>
+struct EndgameBase {
 
-protected:
-  Color strongerSide, weakerSide;
+  virtual ~EndgameBase() = default;
+  virtual Color strong_side() const = 0;
+  virtual T operator()(const Position&) const = 0;
 };
 
 
-template<typename T, EndgameType>
+template<EndgameType E, typename T = eg_type<E>>
 struct Endgame : public EndgameBase<T> {
 
-  explicit Endgame(Color c): EndgameBase<T>(c) {}
-  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 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().
 
 class Endgames {
 
-  typedef std::map<Key, EndgameBase<Value>*> EFMap;
-  typedef std::map<Key, EndgameBase<ScaleFactor>*> SFMap;
+  template<typename T> using Map = std::map<Key, std::unique_ptr<EndgameBase<T>>>;
 
-public:
-  Endgames();
-  ~Endgames();
-  template<class T> T* get(Key key) const;
+  template<EndgameType E, typename T = eg_type<E>>
+  void add(const std::string& code);
 
-private:
-  template<class T> void add(const std::string& keyCode);
+  template<typename T>
+  Map<T>& map() {
+    return std::get<std::is_same<T, ScaleFactor>::value>(maps);
+  }
+
+  std::pair<Map<Value>, Map<ScaleFactor>> maps;
 
-  // Here we store two maps, for evaluate and scaling functions...
-  std::pair<EFMap, SFMap> maps;
+public:
+  Endgames();
 
-  // ...and here is the accessing template function
-  template<typename T> const std::map<Key, T*>& get() const;
+  template<typename T>
+  EndgameBase<T>* probe(Key key) {
+    return map<T>().count(key) ? map<T>()[key].get() : nullptr;
+  }
 };
 
-#endif // !defined(ENDGAME_H_INCLUDED)
+#endif // #ifndef ENDGAME_H_INCLUDED