Simplify Endgames::probe()

With this API change we simplify both function and caller site.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/endgame.h b/src/endgame.h
index 424a3591cb80e6a67b22c784f524621186d28a98..0d7c063fbb1c37af9a20f87b2a52b7f7c0db4441 100644 (file)
--- a/src/endgame.h
+++ b/src/endgame.h
@@ -94,7 +94,7 @@ private:
 
 /// 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 operator() method that is virtual.
+/// endgame function calling its operator() that is virtual.
 
 class Endgames {
 
@@ -104,8 +104,8 @@ class Endgames {
   M1 m1;
   M2 m2;
 
-  M1& map(M1::value_type::second_type) { return m1; }
-  M2& map(M2::value_type::second_type) { return m2; }
+  M1& map(M1::mapped_type) { return m1; }
+  M2& map(M2::mapped_type) { return m2; }
 
   template<EndgameType E> void add(const std::string& code);
 
@@ -113,9 +113,8 @@ public:
   Endgames();
   ~Endgames();
 
-  template<typename T> EndgameBase<T>* probe(Key key) {
-    return map((EndgameBase<T>*)0).count(key) ? map((EndgameBase<T>*)0)[key] : NULL;
-  }
+  template<typename T> T probe(Key key, T& eg)
+  { return eg = map(eg).count(key) ? map(eg)[key] : NULL; }
 };
 
 #endif // !defined(ENDGAME_H_INCLUDED)

diff --git a/src/material.cpp b/src/material.cpp
index 0e3ca8320e7a586a5a0f99cbf0a85e2b103d52d8..50b3a2aaa0a5d7ea30c283b2136c719704997c1d 100644 (file)
--- a/src/material.cpp
+++ b/src/material.cpp
@@ -108,7 +108,7 @@ MaterialEntry* MaterialTable::probe(const Position& pos) {
   // Let's look if we have a specialized evaluation function for this
   // particular material configuration. First we look for a fixed
   // configuration one, then a generic one if previous search failed.
-  if ((e->evaluationFunction = endgames.probe<Value>(key)) != NULL)
+  if (endgames.probe(key, e->evaluationFunction))
       return e;
 
   if (is_KXK<WHITE>(pos))
@@ -145,7 +145,7 @@ MaterialEntry* MaterialTable::probe(const Position& pos) {
   // scaling functions and we need to decide which one to use.
   EndgameBase<ScaleFactor>* sf;
 
-  if ((sf = endgames.probe<ScaleFactor>(key)) != NULL)
+  if (endgames.probe(key, sf))
   {
       e->scalingFunction[sf->color()] = sf;
       return e;

diff --git a/src/misc.cpp b/src/misc.cpp
index 3206a2d1950081229b0e9d3f623ba2db66dc8f81..0f0fca46624da7c0212b2971c72b0d8a02c2eae8 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -51,17 +51,15 @@ const string engine_info(bool to_uci) {
   string month, day, year;
   stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
 
+  s << "Stockfish " << Version;
+
   if (Version.empty())
   {
       date >> month >> day >> year;
 
-      s << "Stockfish " << Tag
-        << setfill('0') << " " << year.substr(2)
-        << setw(2) << (1 + months.find(month) / 4)
-        << setw(2) << day;
+      s << Tag << setfill('0') << " " << year.substr(2)
+        << setw(2) << (1 + months.find(month) / 4) << setw(2) << day;
   }
-  else
-      s << "Stockfish " << Version;
 
   s << cpu64 << popcnt << (to_uci ? "\nid author ": " by ")
     << "Tord Romstad, Marco Costalba and Joona Kiiski";