GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-09 18:29:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

final fixes and updates for alpha3

Browse Source
This commit is contained in:
Benoit Jacob 2008-01-13 23:38:48 +00:00
parent 57d7b7d97b
commit 183bf54d27
7 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Eigen/src/Core/Block.h
View File

@ -268,10 +268,13 @@ template<typename Scalar, typename Derived>
Block<Derived> MatrixBase<Scalar, Derived>
::corner(CornerType type, int cRows, int cCols)
{
if(type == TopLeft) return Block<Derived>(ref(), 0, 0, cRows, cCols);
else if(type == TopRight) return Block<Derived>(ref(), 0, cols() - cCols, cRows, cCols);
else if(type == BottomLeft) return Block<Derived>(ref(), rows() - cRows, 0, cRows, cCols);
else if(type == BottomRight)
if(type == TopLeft)
return Block<Derived>(ref(), 0, 0, cRows, cCols);
else if(type == TopRight)
return Block<Derived>(ref(), 0, cols() - cCols, cRows, cCols);
else if(type == BottomLeft)
return Block<Derived>(ref(), rows() - cRows, 0, cRows, cCols);
else
return Block<Derived>(ref(), rows() - cRows, cols() - cCols, cRows, cCols);
}
@ -280,10 +283,13 @@ template<typename Scalar, typename Derived>
const Block<Derived> MatrixBase<Scalar, Derived>
::corner(CornerType type, int cRows, int cCols) const
{
if(type == TopLeft) return Block<Derived>(ref(), 0, 0, cRows, cCols);
else if(type == TopRight) return Block<Derived>(ref(), 0, cols() - cCols, cRows, cCols);
else if(type == BottomLeft) return Block<Derived>(ref(), rows() - cRows, 0, cRows, cCols);
else if(type == BottomRight)
if(type == TopLeft)
return Block<Derived>(ref(), 0, 0, cRows, cCols);
else if(type == TopRight)
return Block<Derived>(ref(), 0, cols() - cCols, cRows, cCols);
else if(type == BottomLeft)
return Block<Derived>(ref(), rows() - cRows, 0, cRows, cCols);
else
return Block<Derived>(ref(), rows() - cRows, cols() - cCols, cRows, cCols);
}

4
Eigen/src/Core/FixedBlock.h
View File

@ -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<typename MatrixType, int BlockRows, int BlockCols> class FixedBlock
: public MatrixBase<typename MatrixType::Scalar,
@ -107,7 +107,7 @@ template<typename MatrixType, int BlockRows, int BlockCols> 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<typename Scalar, typename Derived>
template<int BlockRows, int BlockCols>

2
doc/Doxyfile.in
View File

@ -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

8
doc/Mainpage.dox
View File

@ -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</li>
<li>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.</li>
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.</li>
<li>Both column-vectors and row-vectors are supported, as special cases of matrices.</li>
<li>The following scalar types are supported and well tested: \c int, \c float, \c double,
\c std::complex<float>, \c std::complex<double>. </li>
@ -69,7 +73,7 @@ If you want to stay informed of Eigen news and releases, please subscribe to our
<a name="download"></a>
<h2>Download</h2>
The source code of the latest release is here: <a href="http://download.tuxfamily.org/eigen/eigen-2.0-alpha2.tar.gz">eigen-2.0-alpha2.tar.gz</a><br/>
The source code of the latest release is here: <a href="http://download.tuxfamily.org/eigen/eigen-2.0-alpha3.tar.gz">eigen-2.0-alpha3.tar.gz</a><br/>
Alternatively, you can checkout the development tree by anonymous svn, by doing:
<pre>svn co svn://anonsvn.kde.org/home/kde/branches/work/eigen2</pre>

18
doc/examples/class_Block.cpp
View File

@ -3,24 +3,24 @@ USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
template<typename Scalar, typename Derived>
Eigen::FixedBlock<Derived, 2, 2>
topLeft2x2Corner(MatrixBase<Scalar, Derived>& m)
Eigen::Block<Derived>
topLeftCorner(MatrixBase<Scalar, Derived>& m, int rows, int cols)
{
return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
return Eigen::Block<Derived>(m.ref(), 0, 0, rows, cols);
}
template<typename Scalar, typename Derived>
const Eigen::FixedBlock<Derived, 2, 2>
topLeft2x2Corner(const MatrixBase<Scalar, Derived>& m)
const Eigen::Block<Derived>
topLeftCorner(const MatrixBase<Scalar, Derived>& m, int rows, int cols)
{
return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
return Eigen::Block<Derived>(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;
}

26
doc/examples/class_DynBlock.cpp
View File

@ -1,26 +0,0 @@
#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
template<typename Scalar, typename Derived>
Eigen::Block<Derived>
topLeftCorner(MatrixBase<Scalar, Derived>& m, int rows, int cols)
{
return Eigen::Block<Derived>(m.ref(), 0, 0, rows, cols);
}
template<typename Scalar, typename Derived>
const Eigen::Block<Derived>
topLeftCorner(const MatrixBase<Scalar, Derived>& m, int rows, int cols)
{
return Eigen::Block<Derived>(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;
}

26
doc/examples/class_FixedBlock.cpp Normal file
View File

@ -0,0 +1,26 @@
#include <Eigen/Core>
USING_PART_OF_NAMESPACE_EIGEN
using namespace std;
template<typename Scalar, typename Derived>
Eigen::FixedBlock<Derived, 2, 2>
topLeft2x2Corner(MatrixBase<Scalar, Derived>& m)
{
return Eigen::FixedBlock<Derived, 2, 2>(m.ref(), 0, 0);
}
template<typename Scalar, typename Derived>
const Eigen::FixedBlock<Derived, 2, 2>
topLeft2x2Corner(const MatrixBase<Scalar, Derived>& m)
{
return Eigen::FixedBlock<Derived, 2, 2>(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;
}