use std's isnan/isinf

shogun-toolbox · Jul 26, 2013 · d459978 · d459978
1 parent d8d7a85
commit d459978
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/src/shogun/mathematics/Math.cpp b/src/shogun/mathematics/Math.cpp
@@ -10,6 +10,7 @@
  */
 #include <shogun/base/SGObject.h>
 #include <shogun/lib/common.h>
+#include <cmath>
 #include <shogun/mathematics/Math.h>
 #include <shogun/mathematics/lapack.h>
 #include <shogun/io/SGIO.h>
@@ -196,3 +197,14 @@ void CMath::linspace(float64_t* output, float64_t start, float64_t end, int32_t
 	}
 	output[n-1] = end;
 }
+
+
+int CMath::is_nan(double f)
+{
+	return std::isnan(f);
+}
+
+int CMath::is_infinity(double f)
+{
+	return std::isinf(f);
+}
diff --git a/src/shogun/mathematics/Math.h b/src/shogun/mathematics/Math.h
@@ -1236,27 +1236,10 @@ class CMath : public CSGObject
 		}
 
 		/// checks whether a float is infinity
-		inline static int is_infinity(double f)
-		{
-#ifdef SUNOS
-			if (fpclass(f) == FP_NINF || fpclass(f) == FP_PINF)
-				return 1;
-			else
-				return 0;
-#else
-            return isinf(f);
-#endif
-		}
+		static int is_infinity(double f);
 
 		/// checks whether a float is nan
-		inline static int is_nan(double f)
-		{
-#ifdef SUNOS
-			return isnand(f);
-#else
-            return isnan(f);
-#endif
-		}
+		static int is_nan(double f);
 
 		/**@name summing functions */
 		//@{