Merge branch 'feature-2.0' into feature-2.0-stable-ewsb-failure

FlexibleSUSY · Oct 5, 2016 · eae030d · eae030d
2 parents 3432967 + a939cb2
commit eae030d
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/src/wrappers.hpp b/src/wrappers.hpp
@@ -62,6 +62,12 @@ Eigen::Array<Scalar, M, N> Abs(const Eigen::Array<Scalar, M, N>& a)
    return a.cwiseAbs();
 }
 
+template <typename Scalar, int M, int N>
+Eigen::Matrix<Scalar, M, N> Abs(const Eigen::Matrix<Scalar, M, N>& a)
+{
+   return a.cwiseAbs();
+}
+
 template <class T>
 std::vector<T> Abs(std::vector<T> v)
 {
@@ -600,6 +606,16 @@ std::string ToString(T a)
    return boost::lexical_cast<std::string>(a);
 }
 
+inline double Total(double a)
+{
+   return a;
+}
+
+inline std::complex<double> Total(const std::complex<double>& a)
+{
+   return a;
+}
+
 template <class T>
 T Total(const std::vector<T>& v)
 {
@@ -612,6 +628,12 @@ Scalar Total(const Eigen::Array<Scalar, M, N>& a)
    return a.sum();
 }
 
+template <typename Scalar, int M, int N>
+Scalar Total(const Eigen::Matrix<Scalar, M, N>& a)
+{
+   return a.sum();
+}
+
 template <class Scalar, int M, int N>
 Eigen::Array<Scalar,M,N> Total(const std::vector<Eigen::Array<Scalar,M,N> >& v)
 {