From 183bf54d27c948219585f52657355338eb695d08 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Sun, 13 Jan 2008 23:38:48 +0000 Subject: [PATCH] final fixes and updates for alpha3 --- Eigen/src/Core/Block.h | 22 ++++++++++++++-------- Eigen/src/Core/FixedBlock.h | 4 ++-- doc/Doxyfile.in | 2 +- doc/Mainpage.dox | 8 ++++++-- doc/examples/class_Block.cpp | 18 +++++++++--------- doc/examples/class_DynBlock.cpp | 26 -------------------------- doc/examples/class_FixedBlock.cpp | 26 ++++++++++++++++++++++++++ 7 files changed, 58 insertions(+), 48 deletions(-) delete mode 100644 doc/examples/class_DynBlock.cpp create mode 100644 doc/examples/class_FixedBlock.cpp diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h index ffb6188ff..c09004832 100644 --- a/Eigen/src/Core/Block.h +++ b/Eigen/src/Core/Block.h @@ -268,10 +268,13 @@ template Block MatrixBase ::corner(CornerType type, int cRows, int cCols) { - if(type == TopLeft) return Block(ref(), 0, 0, cRows, cCols); - else if(type == TopRight) return Block(ref(), 0, cols() - cCols, cRows, cCols); - else if(type == BottomLeft) return Block(ref(), rows() - cRows, 0, cRows, cCols); - else if(type == BottomRight) + if(type == TopLeft) + return Block(ref(), 0, 0, cRows, cCols); + else if(type == TopRight) + return Block(ref(), 0, cols() - cCols, cRows, cCols); + else if(type == BottomLeft) + return Block(ref(), rows() - cRows, 0, cRows, cCols); + else return Block(ref(), rows() - cRows, cols() - cCols, cRows, cCols); } @@ -280,10 +283,13 @@ template const Block MatrixBase ::corner(CornerType type, int cRows, int cCols) const { - if(type == TopLeft) return Block(ref(), 0, 0, cRows, cCols); - else if(type == TopRight) return Block(ref(), 0, cols() - cCols, cRows, cCols); - else if(type == BottomLeft) return Block(ref(), rows() - cRows, 0, cRows, cCols); - else if(type == BottomRight) + if(type == TopLeft) + return Block(ref(), 0, 0, cRows, cCols); + else if(type == TopRight) + return Block(ref(), 0, cols() - cCols, cRows, cCols); + else if(type == BottomLeft) + return Block(ref(), rows() - cRows, 0, cRows, cCols); + else return Block(ref(), rows() - cRows, cols() - cCols, cRows, cCols); } diff --git a/Eigen/src/Core/FixedBlock.h b/Eigen/src/Core/FixedBlock.h index 27e966b09..95639fcfe 100644 --- a/Eigen/src/Core/FixedBlock.h +++ b/Eigen/src/Core/FixedBlock.h @@ -46,7 +46,7 @@ * \include class_FixedBlock.cpp * Output: \verbinclude class_FixedBlock.out * - * \sa MatrixBase::fixedBlock(int,int), MatrixBase::fixedBlock(int), class Block + * \sa MatrixBase::fixedBlock(int,int), class Block */ template class FixedBlock : public MatrixBase class FixedBlock * Example: \include MatrixBase_fixedBlock_int_int.cpp * Output: \verbinclude MatrixBase_fixedBlock_int_int.out * - * \sa class FixedBlock, fixedBlock(int), block(int,int,int,int) + * \sa class FixedBlock, block(int,int,int,int) */ template template diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index fc699b0d0..6462239e0 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = Eigen -PROJECT_NUMBER = 2.0-alpha2 +PROJECT_NUMBER = 2.0-alpha3 OUTPUT_DIRECTORY = ${CMAKE_BINARY_DIR}/doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff --git a/doc/Mainpage.dox b/doc/Mainpage.dox index 29ee996eb..0ca176854 100644 --- a/doc/Mainpage.dox +++ b/doc/Mainpage.dox @@ -42,7 +42,11 @@ Here are general features of Eigen and more specific features of the Core module \code matrix.row(i) += factor * matrix.row(j); \endcode
  • Both fixed-size and dynamic-size objects are supported, with uniform API, in a way that allows Eigen to make - all usual optimizations in the case of fixed size, such as loop unrolling.
  • + all usual optimizations in the case of fixed size, such as loop unrolling. Moreover + special care is used to ensure that the fixed-size types never cause dynamic memory + allocations. Even when the dimensions of an expression at not known at compile-time, + if a fixed bound is known (e.g. when taking a block in a fixed-size matrix) then + Eigen uses it to allocate a static array instead of a dynamic one.
  • Both column-vectors and row-vectors are supported, as special cases of matrices.
  • The following scalar types are supported and well tested: \c int, \c float, \c double, \c std::complex, \c std::complex.
  • @@ -69,7 +73,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-alpha2.tar.gz
    +The source code of the latest release is here: eigen-2.0-alpha3.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
    diff --git a/doc/examples/class_Block.cpp b/doc/examples/class_Block.cpp index b34cf13ad..6d48d235d 100644 --- a/doc/examples/class_Block.cpp +++ b/doc/examples/class_Block.cpp @@ -3,24 +3,24 @@ USING_PART_OF_NAMESPACE_EIGEN using namespace std; template -Eigen::FixedBlock -topLeft2x2Corner(MatrixBase& m) +Eigen::Block +topLeftCorner(MatrixBase& m, int rows, int cols) { - return Eigen::FixedBlock(m.ref(), 0, 0); + return Eigen::Block(m.ref(), 0, 0, rows, cols); } template -const Eigen::FixedBlock -topLeft2x2Corner(const MatrixBase& m) +const Eigen::Block +topLeftCorner(const MatrixBase& m, int rows, int cols) { - return Eigen::FixedBlock(m.ref(), 0, 0); + return Eigen::Block(m.ref(), 0, 0, rows, cols); } int main(int, char**) { - Matrix3d m = Matrix3d::identity(); - cout << topLeft2x2Corner(4*m) << endl; // calls the const version - topLeft2x2Corner(m) *= 2; // calls the non-const version + Matrix4d m = Matrix4d::identity(); + cout << topLeftCorner(4*m, 2, 3) << endl; // calls the const version + topLeftCorner(m, 2, 3) *= 5; // calls the non-const version cout << "Now the matrix m is:" << endl << m << endl; return 0; } diff --git a/doc/examples/class_DynBlock.cpp b/doc/examples/class_DynBlock.cpp deleted file mode 100644 index 6d48d235d..000000000 --- a/doc/examples/class_DynBlock.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include -USING_PART_OF_NAMESPACE_EIGEN -using namespace std; - -template -Eigen::Block -topLeftCorner(MatrixBase& m, int rows, int cols) -{ - return Eigen::Block(m.ref(), 0, 0, rows, cols); -} - -template -const Eigen::Block -topLeftCorner(const MatrixBase& m, int rows, int cols) -{ - return Eigen::Block(m.ref(), 0, 0, rows, cols); -} - -int main(int, char**) -{ - Matrix4d m = Matrix4d::identity(); - cout << topLeftCorner(4*m, 2, 3) << endl; // calls the const version - topLeftCorner(m, 2, 3) *= 5; // calls the non-const version - cout << "Now the matrix m is:" << endl << m << endl; - return 0; -} diff --git a/doc/examples/class_FixedBlock.cpp b/doc/examples/class_FixedBlock.cpp new file mode 100644 index 000000000..b34cf13ad --- /dev/null +++ b/doc/examples/class_FixedBlock.cpp @@ -0,0 +1,26 @@ +#include +USING_PART_OF_NAMESPACE_EIGEN +using namespace std; + +template +Eigen::FixedBlock +topLeft2x2Corner(MatrixBase& m) +{ + return Eigen::FixedBlock(m.ref(), 0, 0); +} + +template +const Eigen::FixedBlock +topLeft2x2Corner(const MatrixBase& m) +{ + return Eigen::FixedBlock(m.ref(), 0, 0); +} + +int main(int, char**) +{ + Matrix3d m = Matrix3d::identity(); + cout << topLeft2x2Corner(4*m) << endl; // calls the const version + topLeft2x2Corner(m) *= 2; // calls the non-const version + cout << "Now the matrix m is:" << endl << m << endl; + return 0; +}