From ed20f64d6810158f9a75d4dfe5d59586f58ac563 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Fri, 29 Feb 2008 14:50:11 +0000 Subject: [PATCH] release alpha4, Gael edition --- Eigen/src/Core/Difference.h | 104 ----------------------------- Eigen/src/Core/FixedBlock.h | 129 ------------------------------------ Eigen/src/Core/Sum.h | 104 ----------------------------- doc/Doxyfile.in | 2 +- doc/Mainpage.dox | 14 ++-- 5 files changed, 7 insertions(+), 346 deletions(-) delete mode 100644 Eigen/src/Core/Difference.h delete mode 100644 Eigen/src/Core/FixedBlock.h delete mode 100644 Eigen/src/Core/Sum.h 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 -// -// 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 . - -#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 class Difference : NoOperatorEquals, - public MatrixBase > -{ - public: - typedef typename Lhs::Scalar Scalar; - typedef typename Lhs::Ref LhsRef; - typedef typename Rhs::Ref RhsRef; - friend class MatrixBase; - typedef MatrixBase 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 -const Difference -operator-(const MatrixBase &mat1, const MatrixBase &mat2) -{ - return Difference(mat1.ref(), mat2.ref()); -} - -/** replaces \c *this by \c *this - \a other. - * - * \returns a reference to \c *this - */ -template -template -Derived & -MatrixBase::operator-=(const MatrixBase &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 -// -// 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 . - -#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 class FixedBlock - : public MatrixBase > -{ - public: - typedef typename MatrixType::Scalar Scalar; - typedef typename MatrixType::Ref MatRef; - friend class MatrixBase; - typedef MatrixBase 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 - m_startRow; - IntAtRunTimeIfDynamic - 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 -template -FixedBlock MatrixBase - ::fixedBlock(int startRow, int startCol) -{ - return FixedBlock(ref(), startRow, startCol); -} - -/** This is the const version of fixedBlock(int, int). */ -template -template -const FixedBlock MatrixBase - ::fixedBlock(int startRow, int startCol) const -{ - return FixedBlock(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 -// -// 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 . - -#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 class Sum : NoOperatorEquals, - public MatrixBase > -{ - public: - typedef typename Lhs::Scalar Scalar; - typedef typename Lhs::Ref LhsRef; - typedef typename Rhs::Ref RhsRef; - friend class MatrixBase; - typedef MatrixBase 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 -const Sum -operator+(const MatrixBase &mat1, const MatrixBase &mat2) -{ - return Sum(mat1.ref(), mat2.ref()); -} - -/** replaces \c *this by \c *this + \a other. - * - * \returns a reference to \c *this - */ -template -template -Derived & -MatrixBase::operator+=(const MatrixBase& other) -{ - return *this = *this + other; -} - -#endif // EIGEN_SUM_H diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index aae3eb5d5..429215207 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Eigen -PROJECT_NUMBER = 2.0-alpha3.1 +PROJECT_NUMBER = 2.0-alpha4 OUTPUT_DIRECTORY = ${CMAKE_BINARY_DIR}/doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/doc/Mainpage.dox b/doc/Mainpage.dox index 40e737aad..755027f81 100644 --- a/doc/Mainpage.dox +++ b/doc/Mainpage.dox @@ -11,7 +11,7 @@ o /** @mainpage Eigen Relation to KDE
Examples
Applications using Eigen
-Authors
+Credits
Contact us
Mailing list
@@ -82,7 +82,7 @@ If you want to stay informed of Eigen news and releases, please subscribe to our

Download

-The source code of the latest release is here: eigen-2.0-alpha3.1.tar.gz
+The source code of the latest release is here: eigen-2.0-alpha4.tar.gz
Alternatively, you can checkout the development tree by anonymous svn, by doing: 
svn co svn://anonsvn.kde.org/home/kde/branches/work/eigen2
@@ -120,14 +120,12 @@ Planned: much more use in KOffice 2.1, Step (if we make Eigen good enough!) Please tell us if you know of other interesting projects using Eigen! - -

Authors

+ +

Credits

-Main Developer: Benoit Jacob (jacob at math jussieu fr) - -Contributors during the Eigen 2 development process:
    -
  • Gael Guennebaud (gael guennebaud at gmail com) : Intel compiler (ICC) support +
  • Benoit Jacob (jacob at math jussieu fr) : Main developer
    • +
  • Gael Guennebaud (gael guennebaud at gmail com) : Large contributions
  • Christian Mayer (mail at christianmayer de) : reviewed the source code, made many useful suggestions
  • Michael Olbrich (michael olbrich at gmx net) : initial loop-unrolling metaprogram
  • and thanks to everyone on the mailing list for your input!