From cf4f90cceacecee87be359b94595662359d027fb Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Fri, 30 Apr 2010 11:58:17 -0400 Subject: fix #116 and remove debug cout's --- Eigen/src/Core/IO.h | 18 ++++++++++++++++-- Eigen/src/Core/MathFunctions.h | 3 --- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'Eigen') diff --git a/Eigen/src/Core/IO.h b/Eigen/src/Core/IO.h index 853506288..3da92d21a 100644 --- a/Eigen/src/Core/IO.h +++ b/Eigen/src/Core/IO.h @@ -126,8 +126,8 @@ DenseBase::format(const IOFormat& fmt) const return WithFormat(derived(), fmt); } -template -struct ei_significant_decimals_impl +template +struct ei_significant_decimals_default_impl { typedef typename NumTraits::Real RealScalar; static inline int run() @@ -136,6 +136,20 @@ struct ei_significant_decimals_impl } }; +template +struct ei_significant_decimals_default_impl +{ + static inline int run() + { + return 0; + } +}; + +template +struct ei_significant_decimals_impl + : ei_significant_decimals_default_impl::IsInteger> +{}; + /** \internal * print the matrix \a _m to the output stream \a s using the output format \a fmt */ template diff --git a/Eigen/src/Core/MathFunctions.h b/Eigen/src/Core/MathFunctions.h index ad1432f25..74dda7139 100644 --- a/Eigen/src/Core/MathFunctions.h +++ b/Eigen/src/Core/MathFunctions.h @@ -780,7 +780,6 @@ struct ei_scalar_fuzzy_default_impl } static inline bool isApprox(const Scalar& x, const Scalar& y, const RealScalar& prec) { - std::cout << " float" << std::endl; return ei_abs(x - y) <= std::min(ei_abs(x), ei_abs(y)) * prec; } static inline bool isApproxOrLessThan(const Scalar& x, const Scalar& y, const RealScalar& prec) @@ -800,7 +799,6 @@ struct ei_scalar_fuzzy_default_impl } static inline bool isApprox(const Scalar& x, const Scalar& y, const RealScalar&) { - std::cout << " integer" << std::endl; return x == y; } static inline bool isApproxOrLessThan(const Scalar& x, const Scalar& y, const RealScalar&) @@ -820,7 +818,6 @@ struct ei_scalar_fuzzy_default_impl } static inline bool isApprox(const Scalar& x, const Scalar& y, const RealScalar& prec) { - std::cout << " cplx" << std::endl; return ei_abs2(x - y) <= std::min(ei_abs2(x), ei_abs2(y)) * prec * prec; } }; -- cgit v1.2.3