diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-03-21 11:28:31 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-03-21 11:28:31 -0400 |
| commit | 1803db6e8409dae534cca51433a6a0fd6e7c7665 (patch) | |
| tree | a5d5234ea4f7c4be942b801c7ddafb5ee7573066 /Eigen/src | |
| parent | 92da574ec291b32b6f0b645a1d82045eb280437a (diff) | |
| parent | 8b093dd2df07ea204e6e3402db829ca4669faf95 (diff) | |
merge
Diffstat (limited to 'Eigen/src')
| -rw-r--r-- | Eigen/src/Core/products/SelfadjointMatrixVector.h | 3 | ||||
| -rw-r--r-- | Eigen/src/Geometry/Translation.h | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Eigen/src/Core/products/SelfadjointMatrixVector.h b/Eigen/src/Core/products/SelfadjointMatrixVector.h index 627c06801..0f829fd73 100644 --- a/Eigen/src/Core/products/SelfadjointMatrixVector.h +++ b/Eigen/src/Core/products/SelfadjointMatrixVector.h @@ -186,10 +186,11 @@ struct SelfadjointProductMatrix<Lhs,LhsMode,false,Rhs,0,true> * RhsBlasTraits::extractScalarFactor(m_rhs); ei_assert(dst.innerStride()==1 && "not implemented yet"); + ei_product_selfadjoint_vector<Scalar, (ei_traits<_ActualLhsType>::Flags&RowMajorBit) ? RowMajor : ColMajor, int(LhsUpLo), bool(LhsBlasTraits::NeedToConjugate), bool(RhsBlasTraits::NeedToConjugate)> ( lhs.rows(), // size - &lhs.coeff(0,0), lhs.innerStride(), // lhs info + &lhs.coeff(0,0), lhs.outerStride(), // lhs info &rhs.coeff(0), rhs.innerStride(), // rhs info &dst.coeffRef(0), // result info actualAlpha // scale factor diff --git a/Eigen/src/Geometry/Translation.h b/Eigen/src/Geometry/Translation.h index bde72c738..60c12caea 100644 --- a/Eigen/src/Geometry/Translation.h +++ b/Eigen/src/Geometry/Translation.h @@ -81,6 +81,20 @@ public: /** Constructs and initialize the translation transformation from a vector of translation coefficients */ explicit inline Translation(const VectorType& vector) : m_coeffs(vector) {} + /** \brief Retruns the x-translation by value. **/ + inline Scalar x() const { return m_coeffs.x(); } + /** \brief Retruns the y-translation by value. **/ + inline Scalar y() const { return m_coeffs.y(); } + /** \brief Retruns the z-translation by value. **/ + inline Scalar z() const { return m_coeffs.z(); } + + /** \brief Retruns the x-translation as a reference. **/ + inline Scalar& x() { return m_coeffs.x(); } + /** \brief Retruns the y-translation as a reference. **/ + inline Scalar& y() { return m_coeffs.y(); } + /** \brief Retruns the z-translation as a reference. **/ + inline Scalar& z() { return m_coeffs.z(); } + const VectorType& vector() const { return m_coeffs; } VectorType& vector() { return m_coeffs; } |