MSVC: isnan and isinf moved into MathFunctions to be platform independent

Core/Algorithms/src/DecouplingApproximationStrategy.cpp

@@ -19,7 +19,6 @@
 
 #include <cassert>
 #include <iostream>
-#include <cmath>
 
 void DecouplingApproximationStrategy::init(
         const SafePointerVector<FormFactorInfo>& form_factor_infos,
@@ -43,17 +42,17 @@ double DecouplingApproximationStrategy::evaluate(
         complex_t ff =
             m_ff_infos[i]->mp_ff->evaluate(k_i, k_f_bin, alpha_i, alpha_f);
 
-        if (std::isnan(ff.real())) {
+        if (MathFunctions::isnan(ff.real())) {
             std::cout << "Amplitude is NaN: i = " << i << std::endl;
         }
         double fraction = m_ff_infos[i]->m_abundance;
         amplitude += fraction*ff;
         intensity += fraction*(std::norm(ff));
 
-        assert(!std::isnan(amplitude.real()));
-        assert(!std::isnan(amplitude.imag()));
-        assert(!std::isinf(amplitude.real()));
-        assert(!std::isinf(amplitude.imag()));
+        assert(!MathFunctions::isnan(amplitude.real()));
+        assert(!MathFunctions::isnan(amplitude.imag()));
+        assert(!MathFunctions::isinf(amplitude.real()));
+        assert(!MathFunctions::isinf(amplitude.imag()));
 
     }
     double amplitude_norm = std::norm(amplitude);

Core/Algorithms/src/LocalMonodisperseApproximationStrategy.cpp

@@ -15,6 +15,7 @@
 
 #include "LocalMonodisperseApproximationStrategy.h"
 #include "Exceptions.h"
+#include "MathFunctions.h
 #include <cassert>
 
 
@@ -58,8 +59,8 @@ double LocalMonodisperseApproximationStrategy::evaluate(const cvector_t& k_i,
             intensity += fraction*(itf_function*std::norm(ff));
         }
     }
-    assert(!std::isnan(intensity));
-    assert(!std::isinf(intensity));
+    assert(!MathFunctions::isnan(intensity));
+    assert(!MathFunctions::isinf(intensity));
 
     return intensity;
 }

Core/Tools/inc/MathFunctions.h

@@ -23,6 +23,7 @@
 
 #include <cstdlib>
 #include <vector>
+#include <cmath>
 
 #include "gsl/gsl_sf_bessel.h"
 #include "gsl/gsl_sf_trig.h"
@@ -93,6 +94,25 @@ void FastSinCos(const complex_t &x, complex_t &xsin, complex_t &xcos);
 Eigen::Matrix2d Norm(Eigen::Matrix2cd &M);
 #endif
 
+BA_CORE_API_ bool isnan(double x)
+{
+#ifdef _MSC_VER
+	return _isnan(x);
+#else
+	return std::isnan(x);
+#endif
+}
+
+BA_CORE_API_ bool isinf(double x)
+{
+#ifdef _MSC_VER
+	return !_finite(x);
+#else
+	return std::isinf(x);
+#endif
+}
+
+
 } // Namespace MathFunctions
 
 inline double MathFunctions::GenerateNormalRandom(double average, double std_dev)