aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2008-02-29 14:50:11 +0000
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2008-02-29 14:50:11 +0000
commited20f64d6810158f9a75d4dfe5d59586f58ac563 (patch)
tree94f582de8457ebeb87180545674d7c6c85d1ec7f /Eigen/src
parenta2f8d4be6a334ff5caaf782d804330d545b58b53 (diff)
release alpha4, Gael edition
Diffstat (limited to 'Eigen/src')
-rw-r--r--Eigen/src/Core/Difference.h104
-rw-r--r--Eigen/src/Core/FixedBlock.h129
-rw-r--r--Eigen/src/Core/Sum.h104
3 files changed, 0 insertions, 337 deletions
diff --git a/Eigen/src/Core/Difference.h b/Eigen/src/Core/Difference.h
deleted file mode 100644
index 9d51a97db..000000000
--- a/Eigen/src/Core/Difference.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// This file is part of Eigen, a lightweight C++ template library
-// for linear algebra. Eigen itself is part of the KDE project.
-//
-// Copyright (C) 2006-2008 Benoit Jacob <jacob@math.jussieu.fr>
-//
-// Eigen is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 3 of the License, or (at your option) any later version.
-//
-// Alternatively, 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 of
-// the License, or (at your option) any later version.
-//
-// Eigen 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 Lesser General Public License or the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License and a copy of the GNU General Public License along with
-// Eigen. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef EIGEN_DIFFERENCE_H
-#define EIGEN_DIFFERENCE_H
-
-/** \class Difference
- *
- * \brief Expression of the difference (substraction) of two matrices or vectors
- *
- * \param Lhs the type of the left-hand side
- * \param Rhs the type of the right-hand side
- *
- * This class represents an expression of the difference of two matrices or vectors.
- * It is the return type of the operator- between matrices or vectors, and most
- * of the time this is the only way it is used.
- *
- * \sa class Sum, class Opposite
- */
-template<typename Lhs, typename Rhs> class Difference : NoOperatorEquals,
- public MatrixBase<typename Lhs::Scalar, Difference<Lhs, Rhs> >
-{
- public:
- typedef typename Lhs::Scalar Scalar;
- typedef typename Lhs::Ref LhsRef;
- typedef typename Rhs::Ref RhsRef;
- friend class MatrixBase<Scalar, Difference>;
- typedef MatrixBase<Scalar, Difference> Base;
-
- Difference(const LhsRef& lhs, const RhsRef& rhs)
- : m_lhs(lhs), m_rhs(rhs)
- {
- assert(lhs.rows() == rhs.rows() && lhs.cols() == rhs.cols());
- }
-
- private:
- enum {
- RowsAtCompileTime = Lhs::Traits::RowsAtCompileTime,
- ColsAtCompileTime = Lhs::Traits::ColsAtCompileTime,
- MaxRowsAtCompileTime = Lhs::Traits::MaxRowsAtCompileTime,
- MaxColsAtCompileTime = Lhs::Traits::MaxColsAtCompileTime
- };
-
- const Difference& _ref() const { return *this; }
- int _rows() const { return m_lhs.rows(); }
- int _cols() const { return m_lhs.cols(); }
-
- Scalar _coeff(int row, int col) const
- {
- return m_lhs.coeff(row, col) - m_rhs.coeff(row, col);
- }
-
- protected:
- const LhsRef m_lhs;
- const RhsRef m_rhs;
-};
-
-/** \relates MatrixBase
- *
- * \returns an expression of the difference of \a mat1 and \a mat2
- *
- * \sa class Difference, MatrixBase::operator-=()
- */
-template<typename Scalar, typename Derived1, typename Derived2>
-const Difference<Derived1, Derived2>
-operator-(const MatrixBase<Scalar, Derived1> &mat1, const MatrixBase<Scalar, Derived2> &mat2)
-{
- return Difference<Derived1, Derived2>(mat1.ref(), mat2.ref());
-}
-
-/** replaces \c *this by \c *this - \a other.
- *
- * \returns a reference to \c *this
- */
-template<typename Scalar, typename Derived>
-template<typename OtherDerived>
-Derived &
-MatrixBase<Scalar, Derived>::operator-=(const MatrixBase<Scalar, OtherDerived> &other)
-{
- return *this = *this - other;
-}
-
-#endif // EIGEN_DIFFERENCE_H
diff --git a/Eigen/src/Core/FixedBlock.h b/Eigen/src/Core/FixedBlock.h
deleted file mode 100644
index 09e948cff..000000000
--- a/Eigen/src/Core/FixedBlock.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// This file is part of Eigen, a lightweight C++ template library
-// for linear algebra. Eigen itself is part of the KDE project.
-//
-// Copyright (C) 2006-2008 Benoit Jacob <jacob@math.jussieu.fr>
-//
-// Eigen is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 3 of the License, or (at your option) any later version.
-//
-// Alternatively, 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 of
-// the License, or (at your option) any later version.
-//
-// Eigen 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 Lesser General Public License or the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License and a copy of the GNU General Public License along with
-// Eigen. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef EIGEN_FIXEDBLOCK_H
-#define EIGEN_FIXEDBLOCK_H
-
-/** \class FixedBlock
- *
- * \brief Expression of a fixed-size block
- *
- * \param MatrixType the type of the object in which we are taking a block
- * \param BlockRows the number of rows of the block we are taking
- * \param BlockCols the number of columns of the block we are taking
- *
- * This class represents an expression of a fixed-size block. It is the return
- * type of MatrixBase::fixedBlock() and most of the time this is the only way it
- * is used.
- *
- * However, if you want to directly maniputate fixed-size block expressions,
- * for instance if you want to write a function returning such an expression, you
- * will need to use this class.
- *
- * Here is an example illustrating this:
- * \include class_FixedBlock.cpp
- * Output: \verbinclude class_FixedBlock.out
- *
- * \sa MatrixBase::fixedBlock(int,int), class Block
- */
-template<typename MatrixType, int BlockRows, int BlockCols> class FixedBlock
- : public MatrixBase<typename MatrixType::Scalar,
- FixedBlock<MatrixType, BlockRows, BlockCols> >
-{
- public:
- typedef typename MatrixType::Scalar Scalar;
- typedef typename MatrixType::Ref MatRef;
- friend class MatrixBase<Scalar, FixedBlock>;
- typedef MatrixBase<Scalar, FixedBlock> Base;
-
- FixedBlock(const MatRef& matrix, int startRow, int startCol)
- : m_matrix(matrix), m_startRow(startRow), m_startCol(startCol)
- {
- assert(startRow >= 0 && BlockRows >= 1 && startRow + BlockRows <= matrix.rows()
- && startCol >= 0 && BlockCols >= 1 && startCol + BlockCols <= matrix.cols());
- }
-
- EIGEN_INHERIT_ASSIGNMENT_OPERATORS(FixedBlock)
-
- private:
- enum{
- RowsAtCompileTime = BlockRows,
- ColsAtCompileTime = BlockCols,
- MaxRowsAtCompileTime = BlockRows,
- MaxColsAtCompileTime = BlockCols
- };
-
- const FixedBlock& _ref() const { return *this; }
- static int _rows() { return BlockRows; }
- static int _cols() { return BlockCols; }
-
- Scalar& _coeffRef(int row, int col)
- {
- return m_matrix.coeffRef(row + m_startRow.value(), col + m_startCol.value());
- }
-
- Scalar _coeff(int row, int col) const
- {
- return m_matrix.coeff(row + m_startRow.value(), col + m_startCol.value());
- }
-
- protected:
- MatRef m_matrix;
- IntAtRunTimeIfDynamic<MatrixType::Traits::RowsAtCompileTime == 1 ? 0 : Dynamic>
- m_startRow;
- IntAtRunTimeIfDynamic<MatrixType::Traits::ColsAtCompileTime == 1 ? 0 : Dynamic>
- m_startCol;
-};
-
-/** \returns a fixed-size expression of a block in *this.
- *
- * The template parameters \a BlockRows and \a BlockCols are the number of
- * rows and columns in the block.
- *
- * \param startRow the first row in the block
- * \param startCol the first column in the block
- *
- * Example: \include MatrixBase_fixedBlock_int_int.cpp
- * Output: \verbinclude MatrixBase_fixedBlock_int_int.out
- *
- * \sa class FixedBlock, block(int,int,int,int)
- */
-template<typename Scalar, typename Derived>
-template<int BlockRows, int BlockCols>
-FixedBlock<Derived, BlockRows, BlockCols> MatrixBase<Scalar, Derived>
- ::fixedBlock(int startRow, int startCol)
-{
- return FixedBlock<Derived, BlockRows, BlockCols>(ref(), startRow, startCol);
-}
-
-/** This is the const version of fixedBlock(int, int). */
-template<typename Scalar, typename Derived>
-template<int BlockRows, int BlockCols>
-const FixedBlock<Derived, BlockRows, BlockCols> MatrixBase<Scalar, Derived>
- ::fixedBlock(int startRow, int startCol) const
-{
- return FixedBlock<Derived, BlockRows, BlockCols>(ref(), startRow, startCol);
-}
-
-#endif // EIGEN_FIXEDBLOCK_H
diff --git a/Eigen/src/Core/Sum.h b/Eigen/src/Core/Sum.h
deleted file mode 100644
index 750d1eaa9..000000000
--- a/Eigen/src/Core/Sum.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// This file is part of Eigen, a lightweight C++ template library
-// for linear algebra. Eigen itself is part of the KDE project.
-//
-// Copyright (C) 2006-2008 Benoit Jacob <jacob@math.jussieu.fr>
-//
-// Eigen is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 3 of the License, or (at your option) any later version.
-//
-// Alternatively, 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 of
-// the License, or (at your option) any later version.
-//
-// Eigen 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 Lesser General Public License or the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License and a copy of the GNU General Public License along with
-// Eigen. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef EIGEN_SUM_H
-#define EIGEN_SUM_H
-
-/** \class Sum
- *
- * \brief Expression of the sum of two matrices or vectors
- *
- * \param Lhs the type of the left-hand side
- * \param Rhs the type of the right-hand side
- *
- * This class represents an expression of the sum of two matrices or vectors.
- * It is the return type of the operator+ between matrices or vectors, and most
- * of the time this is the only way it is used.
- *
- * \sa class Difference
- */
-template<typename Lhs, typename Rhs> class Sum : NoOperatorEquals,
- public MatrixBase<typename Lhs::Scalar, Sum<Lhs, Rhs> >
-{
- public:
- typedef typename Lhs::Scalar Scalar;
- typedef typename Lhs::Ref LhsRef;
- typedef typename Rhs::Ref RhsRef;
- friend class MatrixBase<Scalar, Sum>;
- typedef MatrixBase<Scalar, Sum> Base;
-
- Sum(const LhsRef& lhs, const RhsRef& rhs)
- : m_lhs(lhs), m_rhs(rhs)
- {
- assert(lhs.rows() == rhs.rows() && lhs.cols() == rhs.cols());
- }
-
- private:
- enum {
- RowsAtCompileTime = Lhs::Traits::RowsAtCompileTime,
- ColsAtCompileTime = Lhs::Traits::ColsAtCompileTime,
- MaxRowsAtCompileTime = Lhs::Traits::MaxRowsAtCompileTime,
- MaxColsAtCompileTime = Lhs::Traits::MaxColsAtCompileTime
- };
-
- const Sum& _ref() const { return *this; }
- int _rows() const { return m_lhs.rows(); }
- int _cols() const { return m_lhs.cols(); }
-
- Scalar _coeff(int row, int col) const
- {
- return m_lhs.coeff(row, col) + m_rhs.coeff(row, col);
- }
-
- protected:
- const LhsRef m_lhs;
- const RhsRef m_rhs;
-};
-
-/** \relates MatrixBase
- *
- * \returns an expression of the sum of \a mat1 and \a mat2
- *
- * \sa class Sum, MatrixBase::operator+=()
- */
-template<typename Scalar, typename Derived1, typename Derived2>
-const Sum<Derived1, Derived2>
-operator+(const MatrixBase<Scalar, Derived1> &mat1, const MatrixBase<Scalar, Derived2> &mat2)
-{
- return Sum<Derived1, Derived2>(mat1.ref(), mat2.ref());
-}
-
-/** replaces \c *this by \c *this + \a other.
- *
- * \returns a reference to \c *this
- */
-template<typename Scalar, typename Derived>
-template<typename OtherDerived>
-Derived &
-MatrixBase<Scalar, Derived>::operator+=(const MatrixBase<Scalar, OtherDerived>& other)
-{
- return *this = *this + other;
-}
-
-#endif // EIGEN_SUM_H