X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fendgame.h;h=f24ac93d44a67e2d3ac286eca0888b205e67e229;hp=20e4a1d8e17ba7f84fdbd5cbefc1344e1e606805;hb=be77406a55d1840862237cffe153dc08a83108d3;hpb=42b48b08e81b55e385e55b3074b7c59d81809a45 diff --git a/src/endgame.h b/src/endgame.h index 20e4a1d8..f24ac93d 100644 --- a/src/endgame.h +++ b/src/endgame.h @@ -21,7 +21,10 @@ #define ENDGAME_H_INCLUDED #include +#include #include +#include +#include #include "position.h" #include "types.h" @@ -45,7 +48,7 @@ enum EndgameType { // Scaling functions - SCALE_FUNS, + SCALING_FUNCTIONS, KBPsK, // KB and pawns vs K KQKRPs, // KQ vs KR and pawns @@ -63,11 +66,9 @@ enum EndgameType { /// Endgame functions can be of two types depending on whether they return a -/// Value or a ScaleFactor. Type eg_fun::type returns either ScaleFactor -/// or Value depending on whether the template parameter is 0 or 1. - -template struct eg_fun { typedef Value type; }; -template<> struct eg_fun<1> { typedef ScaleFactor type; }; +/// Value or a ScaleFactor. +template using +eg_type = typename std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>::type; /// Base and derived templates for endgame evaluation and scaling functions @@ -75,13 +76,13 @@ template<> struct eg_fun<1> { typedef ScaleFactor type; }; template struct EndgameBase { - virtual ~EndgameBase() {} + virtual ~EndgameBase() = default; virtual Color strong_side() const = 0; virtual T operator()(const Position&) const = 0; }; -template SCALE_FUNS)>::type> +template> struct Endgame : public EndgameBase { explicit Endgame(Color c) : strongSide(c), weakSide(~c) {} @@ -89,33 +90,35 @@ struct Endgame : public EndgameBase { T operator()(const Position&) const; private: - const Color strongSide, weakSide; + Color strongSide, weakSide; }; /// The Endgames class stores the pointers to endgame evaluation and scaling -/// base objects in two std::map typedefs. We then use polymorphism to invoke -/// the actual endgame function by calling its virtual operator(). +/// 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::type>*> M1; - typedef std::map::type>*> M2; + template using Map = std::map>>; - M1 m1; - M2 m2; + template> + void add(const std::string& code); - M1& map(M1::mapped_type) { return m1; } - M2& map(M2::mapped_type) { return m2; } + template + Map& map() { + return std::get::value>(maps); + } - template void add(const std::string& code); + std::pair, Map> maps; public: Endgames(); - ~Endgames(); - template T probe(Key key, T& eg) - { return eg = map(eg).count(key) ? map(eg)[key] : NULL; } + template + EndgameBase* probe(Key key) { + return map().count(key) ? map()[key].get() : nullptr; + } }; #endif // #ifndef ENDGAME_H_INCLUDED