diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-01-27 12:04:26 -0500 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-01-27 12:04:26 -0500 |
| commit | b2b8c6a89ca051e87b0e6da3c685f68f617662d2 (patch) | |
| tree | 0864c591b0c3fc8d09d2ddbda62b80e9616fbf79 /Eigen | |
| parent | e761ba68f7828cef0cb647b959a0ef9f80f00fb3 (diff) | |
dot() now always uses eigen3 convention, even in eigen2 support mode, even stage 10. Didn't have a choice as lots of eigen code is using it.
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/Dot.h | 6 | ||||
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 18 |
2 files changed, 6 insertions, 18 deletions
diff --git a/Eigen/src/Core/Dot.h b/Eigen/src/Core/Dot.h index 0d8856efa..837738308 100644 --- a/Eigen/src/Core/Dot.h +++ b/Eigen/src/Core/Dot.h @@ -83,14 +83,10 @@ MatrixBase<Derived>::dot(const MatrixBase<OtherDerived>& other) const eigen_assert(size() == other.size()); -#if EIGEN2_SUPPORT_STAGE >= STAGE30_FULL_EIGEN3_API return internal::dot_nocheck<Derived,OtherDerived>::run(*this, other); -#else - return internal::dot_nocheck<OtherDerived,Derived>::run(other,*this); -#endif } -#if EIGEN2_SUPPORT_STAGE <= STAGE30_FULL_EIGEN3_API +#ifdef EIGEN2_SUPPORT /** \returns the dot product of *this with other, with the Eigen2 convention that the dot product is linear in the first variable * (conjugating the second variable). Of course this only makes a difference in the complex case. * diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 5864cdbd6..398bfaab0 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -200,23 +200,15 @@ template<typename Derived> class MatrixBase const DiagonalProduct<Derived, DiagonalDerived, OnTheRight> operator*(const DiagonalBase<DiagonalDerived> &diagonal) const; - #if EIGEN2_SUPPORT_STAGE != STAGE20_RESOLVE_API_CONFLICTS - template<typename OtherDerived> - typename internal::scalar_product_traits<typename internal::traits<Derived>::Scalar,typename internal::traits<OtherDerived>::Scalar>::ReturnType - #if EIGEN2_SUPPORT_STAGE == STAGE15_RESOLVE_API_CONFLICTS_WARN - EIGEN_DEPRECATED - #endif - dot(const MatrixBase<OtherDerived>& other) const; - #endif - + template<typename OtherDerived> + typename internal::scalar_product_traits<typename internal::traits<Derived>::Scalar,typename internal::traits<OtherDerived>::Scalar>::ReturnType + dot(const MatrixBase<OtherDerived>& other) const; + #ifdef EIGEN2_SUPPORT template<typename OtherDerived> - #if EIGEN2_SUPPORT_STAGE >= STAGE30_FULL_EIGEN3_API - EIGEN_DEPRECATED - #endif Scalar eigen2_dot(const MatrixBase<OtherDerived>& other) const; #endif - + RealScalar squaredNorm() const; RealScalar norm() const; RealScalar stableNorm() const; |