diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2007-10-13 14:19:23 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2007-10-13 14:19:23 +0000 |
| commit | 12bcafdc7587d3ea14195eeeb1e9a307db6131cd (patch) | |
| tree | dd5653078dd1eb26c755f301218ee8407e26ed4b /src/Core/ScalarOps.h | |
| parent | a4626cc80837007673dd95e43c4a97e636ae79eb (diff) | |
some renaming in the fuzzy compares, and in the multiplications
Diffstat (limited to 'src/Core/ScalarOps.h')
| -rw-r--r-- | src/Core/ScalarOps.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Core/ScalarOps.h b/src/Core/ScalarOps.h index 4a71b403e..77c9b9342 100644 --- a/src/Core/ScalarOps.h +++ b/src/Core/ScalarOps.h @@ -26,28 +26,28 @@ #ifndef EI_SCALAROPS_H #define EI_SCALAROPS_H -template<typename MatrixType> class ScalarProduct - : public Object<typename MatrixType::Scalar, ScalarProduct<MatrixType> > +template<typename MatrixType> class ScalarMultiple + : public Object<typename MatrixType::Scalar, ScalarMultiple<MatrixType> > { public: typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::ConstRef MatRef; - friend class Object<typename MatrixType::Scalar, ScalarProduct<MatrixType> >; + friend class Object<typename MatrixType::Scalar, ScalarMultiple<MatrixType> >; static const int RowsAtCompileTime = MatrixType::RowsAtCompileTime, ColsAtCompileTime = MatrixType::ColsAtCompileTime; - ScalarProduct(const MatRef& matrix, Scalar scalar) + ScalarMultiple(const MatRef& matrix, Scalar scalar) : m_matrix(matrix), m_scalar(scalar) {} - ScalarProduct(const ScalarProduct& other) + ScalarMultiple(const ScalarMultiple& other) : m_matrix(other.m_matrix), m_scalar(other.m_scalar) {} - EI_INHERIT_ASSIGNMENT_OPERATORS(ScalarProduct) + EI_INHERIT_ASSIGNMENT_OPERATORS(ScalarMultiple) private: - const ScalarProduct& _ref() const { return *this; } - const ScalarProduct& _constRef() const { return *this; } + const ScalarMultiple& _ref() const { return *this; } + const ScalarMultiple& _constRef() const { return *this; } int _rows() const { return m_matrix.rows(); } int _cols() const { return m_matrix.cols(); } @@ -63,23 +63,23 @@ template<typename MatrixType> class ScalarProduct #define EI_MAKE_SCALAR_OPS(OtherScalar) \ template<typename Scalar, typename Derived> \ -ScalarProduct<Derived> \ +ScalarMultiple<Derived> \ operator*(const Object<Scalar, Derived>& matrix, \ OtherScalar scalar) \ { \ - return ScalarProduct<Derived>(matrix.constRef(), scalar); \ + return ScalarMultiple<Derived>(matrix.constRef(), scalar); \ } \ \ template<typename Scalar, typename Derived> \ -ScalarProduct<Derived> \ +ScalarMultiple<Derived> \ operator*(OtherScalar scalar, \ const Object<Scalar, Derived>& matrix) \ { \ - return ScalarProduct<Derived>(matrix.constRef(), scalar); \ + return ScalarMultiple<Derived>(matrix.constRef(), scalar); \ } \ \ template<typename Scalar, typename Derived> \ -ScalarProduct<Derived> \ +ScalarMultiple<Derived> \ operator/(const Object<Scalar, Derived>& matrix, \ OtherScalar scalar) \ { \ |