diff options
author | 2012-11-06 15:25:50 +0100 | |
---|---|---|
committer | 2012-11-06 15:25:50 +0100 | |
commit | a76fbbf39777827200455477a9e3557b6063913f (patch) | |
tree | 6a03f8fcb163fa2c3dc2267c52fd1204f5490309 /unsupported/Eigen/src/Polynomials/PolynomialSolver.h | |
parent | 959ef37006e60f68b9a9e667bf9da2e14eb0e8af (diff) |
Fix bug #314:
- remove most of the metaprogramming kung fu in MathFunctions.h (only keep functions that differs from the std)
- remove the overloads for array expression that were in the std namespace
Diffstat (limited to 'unsupported/Eigen/src/Polynomials/PolynomialSolver.h')
-rw-r--r-- | unsupported/Eigen/src/Polynomials/PolynomialSolver.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/unsupported/Eigen/src/Polynomials/PolynomialSolver.h b/unsupported/Eigen/src/Polynomials/PolynomialSolver.h index 70b873dbc..fba8fc910 100644 --- a/unsupported/Eigen/src/Polynomials/PolynomialSolver.h +++ b/unsupported/Eigen/src/Polynomials/PolynomialSolver.h @@ -69,10 +69,11 @@ class PolynomialSolverBase inline void realRoots( Stl_back_insertion_sequence& bi_seq, const RealScalar& absImaginaryThreshold = NumTraits<Scalar>::dummy_precision() ) const { + using std::abs; bi_seq.clear(); for(Index i=0; i<m_roots.size(); ++i ) { - if( internal::abs( m_roots[i].imag() ) < absImaginaryThreshold ){ + if( abs( m_roots[i].imag() ) < absImaginaryThreshold ){ bi_seq.push_back( m_roots[i].real() ); } } } @@ -118,13 +119,14 @@ class PolynomialSolverBase bool& hasArealRoot, const RealScalar& absImaginaryThreshold = NumTraits<Scalar>::dummy_precision() ) const { + using std::abs; hasArealRoot = false; Index res=0; RealScalar abs2(0); for( Index i=0; i<m_roots.size(); ++i ) { - if( internal::abs( m_roots[i].imag() ) < absImaginaryThreshold ) + if( abs( m_roots[i].imag() ) < absImaginaryThreshold ) { if( !hasArealRoot ) { @@ -144,7 +146,7 @@ class PolynomialSolverBase } else { - if( internal::abs( m_roots[i].imag() ) < internal::abs( m_roots[res].imag() ) ){ + if( abs( m_roots[i].imag() ) < abs( m_roots[res].imag() ) ){ res = i; } } } @@ -158,13 +160,14 @@ class PolynomialSolverBase bool& hasArealRoot, const RealScalar& absImaginaryThreshold = NumTraits<Scalar>::dummy_precision() ) const { + using std::abs; hasArealRoot = false; Index res=0; RealScalar val(0); for( Index i=0; i<m_roots.size(); ++i ) { - if( internal::abs( m_roots[i].imag() ) < absImaginaryThreshold ) + if( abs( m_roots[i].imag() ) < absImaginaryThreshold ) { if( !hasArealRoot ) { @@ -184,7 +187,7 @@ class PolynomialSolverBase } else { - if( internal::abs( m_roots[i].imag() ) < internal::abs( m_roots[res].imag() ) ){ + if( abs( m_roots[i].imag() ) < abs( m_roots[res].imag() ) ){ res = i; } } } |