Slight tidy up in endgame machinery

[stockfish] / src / endgame.h

diff --git a/src/endgame.h b/src/endgame.h
index b5255a2f53d74e16031cf0a3fd45b7d88df1724a..69a9f179c08e10bc9a41f139d6c9c6fb8d2860e6 100644 (file)
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -64,6 +64,7 @@ enum EndgameCode {
 
 /// Endgame functions can be of two types depending on whether they return a
 /// Value or a ScaleFactor.
 
 /// Endgame functions can be of two types depending on whether they return a
 /// Value or a ScaleFactor.

+

 template<EndgameCode E> using
 eg_type = typename std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>::type;
 
 template<EndgameCode E> using
 eg_type = typename std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>::type;
 


@@ -103,21 +104,40 @@ class Endgames {
     return std::get<std::is_same<T, ScaleFactor>::value>(maps);
   }
 
     return std::get<std::is_same<T, ScaleFactor>::value>(maps);
   }
 

-  template<EndgameCode E, typename T = eg_type<E>, typename P = Ptr<T>>
+  template<EndgameCode E, typename T = eg_type<E>>

   void add(const std::string& code) {
 
     StateInfo st;
   void add(const std::string& code) {
 
     StateInfo st;

-    map<T>()[Position().set(code, WHITE, &st).material_key()] = P(new Endgame<E>(WHITE));
-    map<T>()[Position().set(code, BLACK, &st).material_key()] = P(new Endgame<E>(BLACK));
+    map<T>()[Position().set(code, WHITE, &st).material_key()] = Ptr<T>(new Endgame<E>(WHITE));
+    map<T>()[Position().set(code, BLACK, &st).material_key()] = Ptr<T>(new Endgame<E>(BLACK));

   }
 
   std::pair<Map<Value>, Map<ScaleFactor>> maps;
 
 public:
   }
 
   std::pair<Map<Value>, Map<ScaleFactor>> maps;
 
 public:

-  Endgames();
+  Endgames() {
+
+    add<KPK>("KPK");
+    add<KNNK>("KNNK");
+    add<KBNK>("KBNK");
+    add<KRKP>("KRKP");
+    add<KRKB>("KRKB");
+    add<KRKN>("KRKN");
+    add<KQKP>("KQKP");
+    add<KQKR>("KQKR");
+
+    add<KNPK>("KNPK");
+    add<KNPKB>("KNPKB");
+    add<KRPKR>("KRPKR");
+    add<KRPKB>("KRPKB");
+    add<KBPKB>("KBPKB");
+    add<KBPKN>("KBPKN");
+    add<KBPPKB>("KBPPKB");
+    add<KRPPKRP>("KRPPKRP");
+  }

 
   template<typename T>
 
   template<typename T>

-  EndgameBase<T>* probe(Key key) {
+  const EndgameBase<T>* probe(Key key) {

     return map<T>().count(key) ? map<T>()[key].get() : nullptr;
   }
 };
     return map<T>().count(key) ? map<T>()[key].get() : nullptr;
   }
 };