aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Core/MatrixOps.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/Core/MatrixOps.h')
-rw-r--r--src/Core/MatrixOps.h98
1 files changed, 49 insertions, 49 deletions
diff --git a/src/Core/MatrixOps.h b/src/Core/MatrixOps.h
index 1449a3923..0861a2bff 100644
--- a/src/Core/MatrixOps.h
+++ b/src/Core/MatrixOps.h
@@ -1,19 +1,19 @@
-// This file is part of Eigen, a lightweight C++ template library
-// for linear algebra. Eigen itself is part of the KDE project.
+// This file is part of gen, a lightweight C++ template library
+// for linear algebra. gen itself is part of the KDE project.
//
// Copyright (C) 2006-2007 Benoit Jacob <jacob@math.jussieu.fr>
//
-// Eigen is free software; you can redistribute it and/or modify it under the
+// gen is free software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the Free Software
// Foundation; either version 2 or (at your option) any later version.
//
-// Eigen is distributed in the hope that it will be useful, but WITHOUT ANY
+// gen is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
// details.
//
// You should have received a copy of the GNU General Public License along
-// with Eigen; if not, write to the Free Software Foundation, Inc., 51
+// with gen; if not, write to the Free Software Foundation, Inc., 51
// Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
//
// As a special exception, if other files instantiate templates or use macros
@@ -26,33 +26,33 @@
#ifndef EI_MATRIXOPS_H
#define EI_MATRIXOPS_H
-template<typename Lhs, typename Rhs> class EiSum
- : public EiObject<typename Lhs::Scalar, EiSum<Lhs, Rhs> >
+template<typename Lhs, typename Rhs> class Sum
+ : public Object<typename Lhs::Scalar, Sum<Lhs, Rhs> >
{
public:
typedef typename Lhs::Scalar Scalar;
typedef typename Lhs::ConstRef LhsRef;
typedef typename Rhs::ConstRef RhsRef;
- friend class EiObject<Scalar, EiSum>;
+ friend class Object<Scalar, Sum>;
static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
ColsAtCompileTime = Rhs::ColsAtCompileTime;
- EiSum(const LhsRef& lhs, const RhsRef& rhs)
+ Sum(const LhsRef& lhs, const RhsRef& rhs)
: m_lhs(lhs), m_rhs(rhs)
{
assert(lhs.rows() == rhs.rows() && lhs.cols() == rhs.cols());
}
- EiSum(const EiSum& other)
+ Sum(const Sum& other)
: m_lhs(other.m_lhs), m_rhs(other.m_rhs) {}
- EI_INHERIT_ASSIGNMENT_OPERATORS(EiSum)
+ EI_INHERIT_ASSIGNMENT_OPERATORS(Sum)
private:
- const EiSum& _ref() const { return *this; }
- const EiSum& _constRef() const { return *this; }
+ const Sum& _ref() const { return *this; }
+ const Sum& _constRef() const { return *this; }
int _rows() const { return m_lhs.rows(); }
int _cols() const { return m_lhs.cols(); }
@@ -66,32 +66,32 @@ template<typename Lhs, typename Rhs> class EiSum
const RhsRef m_rhs;
};
-template<typename Lhs, typename Rhs> class EiDifference
- : public EiObject<typename Lhs::Scalar, EiDifference<Lhs, Rhs> >
+template<typename Lhs, typename Rhs> class Difference
+ : public Object<typename Lhs::Scalar, Difference<Lhs, Rhs> >
{
public:
typedef typename Lhs::Scalar Scalar;
typedef typename Lhs::ConstRef LhsRef;
typedef typename Rhs::ConstRef RhsRef;
- friend class EiObject<Scalar, EiDifference>;
+ friend class Object<Scalar, Difference>;
static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
ColsAtCompileTime = Rhs::ColsAtCompileTime;
- EiDifference(const LhsRef& lhs, const RhsRef& rhs)
+ Difference(const LhsRef& lhs, const RhsRef& rhs)
: m_lhs(lhs), m_rhs(rhs)
{
assert(lhs.rows() == rhs.rows() && lhs.cols() == rhs.cols());
}
- EiDifference(const EiDifference& other)
+ Difference(const Difference& other)
: m_lhs(other.m_lhs), m_rhs(other.m_rhs) {}
- EI_INHERIT_ASSIGNMENT_OPERATORS(EiDifference)
+ EI_INHERIT_ASSIGNMENT_OPERATORS(Difference)
private:
- const EiDifference& _ref() const { return *this; }
- const EiDifference& _constRef() const { return *this; }
+ const Difference& _ref() const { return *this; }
+ const Difference& _constRef() const { return *this; }
int _rows() const { return m_lhs.rows(); }
int _cols() const { return m_lhs.cols(); }
@@ -106,18 +106,18 @@ template<typename Lhs, typename Rhs> class EiDifference
};
template<int Index, int Size, typename Lhs, typename Rhs>
-struct EiMatrixProductUnroller
+struct MatrixProductUnroller
{
static void run(int row, int col, const Lhs& lhs, const Rhs& rhs,
typename Lhs::Scalar &res)
{
- EiMatrixProductUnroller<Index-1, Size, Lhs, Rhs>::run(row, col, lhs, rhs, res);
+ MatrixProductUnroller<Index-1, Size, Lhs, Rhs>::run(row, col, lhs, rhs, res);
res += lhs.read(row, Index) * rhs.read(Index, col);
}
};
template<int Size, typename Lhs, typename Rhs>
-struct EiMatrixProductUnroller<0, Size, Lhs, Rhs>
+struct MatrixProductUnroller<0, Size, Lhs, Rhs>
{
static void run(int row, int col, const Lhs& lhs, const Rhs& rhs,
typename Lhs::Scalar &res)
@@ -127,7 +127,7 @@ struct EiMatrixProductUnroller<0, Size, Lhs, Rhs>
};
template<int Index, typename Lhs, typename Rhs>
-struct EiMatrixProductUnroller<Index, EiDynamic, Lhs, Rhs>
+struct MatrixProductUnroller<Index, Dynamic, Lhs, Rhs>
{
static void run(int row, int col, const Lhs& lhs, const Rhs& rhs,
typename Lhs::Scalar &res)
@@ -140,40 +140,40 @@ struct EiMatrixProductUnroller<Index, EiDynamic, Lhs, Rhs>
}
};
-template<typename Lhs, typename Rhs> class EiMatrixProduct
- : public EiObject<typename Lhs::Scalar, EiMatrixProduct<Lhs, Rhs> >
+template<typename Lhs, typename Rhs> class MatrixProduct
+ : public Object<typename Lhs::Scalar, MatrixProduct<Lhs, Rhs> >
{
public:
typedef typename Lhs::Scalar Scalar;
typedef typename Lhs::ConstRef LhsRef;
typedef typename Rhs::ConstRef RhsRef;
- friend class EiObject<Scalar, EiMatrixProduct>;
+ friend class Object<Scalar, MatrixProduct>;
static const int RowsAtCompileTime = Lhs::RowsAtCompileTime,
ColsAtCompileTime = Rhs::ColsAtCompileTime;
- EiMatrixProduct(const LhsRef& lhs, const RhsRef& rhs)
+ MatrixProduct(const LhsRef& lhs, const RhsRef& rhs)
: m_lhs(lhs), m_rhs(rhs)
{
assert(lhs.cols() == rhs.rows());
}
- EiMatrixProduct(const EiMatrixProduct& other)
+ MatrixProduct(const MatrixProduct& other)
: m_lhs(other.m_lhs), m_rhs(other.m_rhs) {}
- EI_INHERIT_ASSIGNMENT_OPERATORS(EiMatrixProduct)
+ EI_INHERIT_ASSIGNMENT_OPERATORS(MatrixProduct)
private:
- const EiMatrixProduct& _ref() const { return *this; }
- const EiMatrixProduct& _constRef() const { return *this; }
+ const MatrixProduct& _ref() const { return *this; }
+ const MatrixProduct& _constRef() const { return *this; }
int _rows() const { return m_lhs.rows(); }
int _cols() const { return m_rhs.cols(); }
Scalar _read(int row, int col) const
{
Scalar res;
- if(Lhs::ColsAtCompileTime != EiDynamic && Lhs::ColsAtCompileTime <= 16)
- EiMatrixProductUnroller<Lhs::ColsAtCompileTime-1, Lhs::ColsAtCompileTime, LhsRef, RhsRef>
+ if(Lhs::ColsAtCompileTime != Dynamic && Lhs::ColsAtCompileTime <= 16)
+ MatrixProductUnroller<Lhs::ColsAtCompileTime-1, Lhs::ColsAtCompileTime, LhsRef, RhsRef>
::run(row, col, m_lhs, m_rhs, res);
else
{
@@ -190,30 +190,30 @@ template<typename Lhs, typename Rhs> class EiMatrixProduct
};
template<typename Scalar, typename Derived1, typename Derived2>
-EiSum<Derived1, Derived2>
-operator+(const EiObject<Scalar, Derived1> &mat1, const EiObject<Scalar, Derived2> &mat2)
+Sum<Derived1, Derived2>
+operator+(const Object<Scalar, Derived1> &mat1, const Object<Scalar, Derived2> &mat2)
{
- return EiSum<Derived1, Derived2>(mat1.constRef(), mat2.constRef());
+ return Sum<Derived1, Derived2>(mat1.constRef(), mat2.constRef());
}
template<typename Scalar, typename Derived1, typename Derived2>
-EiDifference<Derived1, Derived2>
-operator-(const EiObject<Scalar, Derived1> &mat1, const EiObject<Scalar, Derived2> &mat2)
+Difference<Derived1, Derived2>
+operator-(const Object<Scalar, Derived1> &mat1, const Object<Scalar, Derived2> &mat2)
{
- return EiDifference<Derived1, Derived2>(mat1.constRef(), mat2.constRef());
+ return Difference<Derived1, Derived2>(mat1.constRef(), mat2.constRef());
}
template<typename Scalar, typename Derived>
template<typename OtherDerived>
-EiMatrixProduct<Derived, OtherDerived>
-EiObject<Scalar, Derived>::lazyMul(const EiObject<Scalar, OtherDerived> &other) const
+MatrixProduct<Derived, OtherDerived>
+Object<Scalar, Derived>::lazyMul(const Object<Scalar, OtherDerived> &other) const
{
- return EiMatrixProduct<Derived, OtherDerived>(constRef(), other.constRef());
+ return MatrixProduct<Derived, OtherDerived>(constRef(), other.constRef());
}
template<typename Scalar, typename Derived1, typename Derived2>
-EiEval<EiMatrixProduct<Derived1, Derived2> >
-operator*(const EiObject<Scalar, Derived1> &mat1, const EiObject<Scalar, Derived2> &mat2)
+Eval<MatrixProduct<Derived1, Derived2> >
+operator*(const Object<Scalar, Derived1> &mat1, const Object<Scalar, Derived2> &mat2)
{
return mat1.lazyMul(mat2).eval();
}
@@ -221,7 +221,7 @@ operator*(const EiObject<Scalar, Derived1> &mat1, const EiObject<Scalar, Derived
template<typename Scalar, typename Derived>
template<typename OtherDerived>
Derived &
-EiObject<Scalar, Derived>::operator+=(const EiObject<Scalar, OtherDerived>& other)
+Object<Scalar, Derived>::operator+=(const Object<Scalar, OtherDerived>& other)
{
return *this = *this + other;
}
@@ -229,7 +229,7 @@ EiObject<Scalar, Derived>::operator+=(const EiObject<Scalar, OtherDerived>& othe
template<typename Scalar, typename Derived>
template<typename OtherDerived>
Derived &
-EiObject<Scalar, Derived>::operator-=(const EiObject<Scalar, OtherDerived> &other)
+Object<Scalar, Derived>::operator-=(const Object<Scalar, OtherDerived> &other)
{
return *this = *this - other;
}
@@ -237,7 +237,7 @@ EiObject<Scalar, Derived>::operator-=(const EiObject<Scalar, OtherDerived> &othe
template<typename Scalar, typename Derived>
template<typename OtherDerived>
Derived &
-EiObject<Scalar, Derived>::operator*=(const EiObject<Scalar, OtherDerived> &other)
+Object<Scalar, Derived>::operator*=(const Object<Scalar, OtherDerived> &other)
{
return *this = *this * other;
}