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

update the inverse test a little

Browse Source 
make use of static asserts in Map
fix 2 warnings in CacheFriendlyProduct: unused var 'Vectorized'
This commit is contained in:
Benoit Jacob 2008-07-26 12:08:28 +00:00
parent b466c266a0
commit f997a3e902
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/CacheFriendlyProduct.h
View File

@ -406,7 +406,6 @@ EIGEN_DONT_INLINE static void ei_cache_friendly_product_colmajor_times_vector(
const int peels = 2; const int peels = 2;
const int PacketAlignedMask = PacketSize-1; const int PacketAlignedMask = PacketSize-1;
const int PeelAlignedMask = PacketSize*peels-1; const int PeelAlignedMask = PacketSize*peels-1;
const bool Vectorized = sizeof(Packet) != sizeof(Scalar);
// How many coeffs of the result do we have to skip to be aligned. // How many coeffs of the result do we have to skip to be aligned.
// Here we assume data are at least aligned on the base scalar type that is mandatory anyway. // Here we assume data are at least aligned on the base scalar type that is mandatory anyway.
@ -571,7 +570,6 @@ EIGEN_DONT_INLINE static void ei_cache_friendly_product_rowmajor_times_vector(
// const int peels = 2; // const int peels = 2;
const int PacketAlignedMask = PacketSize-1; const int PacketAlignedMask = PacketSize-1;
// const int PeelAlignedMask = PacketSize*peels-1; // const int PeelAlignedMask = PacketSize*peels-1;
const bool Vectorized = sizeof(Packet) != sizeof(Scalar);
const int size = rhsSize; const int size = rhsSize;
// How many coeffs of the result do we have to skip to be aligned. // How many coeffs of the result do we have to skip to be aligned.

9
Eigen/src/Core/Map.h
View File

@ -127,8 +127,7 @@ template<typename MatrixType, int Alignment> class Map
inline Map(const Scalar* data) : m_data(data), m_rows(RowsAtCompileTime), m_cols(ColsAtCompileTime) inline Map(const Scalar* data) : m_data(data), m_rows(RowsAtCompileTime), m_cols(ColsAtCompileTime)
{ {
ei_assert(RowsAtCompileTime != Dynamic && ColsAtCompileTime != Dynamic); EIGEN_STATIC_ASSERT_FIXED_SIZE(MatrixType)
ei_assert(RowsAtCompileTime > 0 && ColsAtCompileTime > 0);
} }
inline Map(const Scalar* data, int size) inline Map(const Scalar* data, int size)
@ -136,11 +135,9 @@ template<typename MatrixType, int Alignment> class Map
m_rows(RowsAtCompileTime == Dynamic ? size : RowsAtCompileTime), m_rows(RowsAtCompileTime == Dynamic ? size : RowsAtCompileTime),
m_cols(ColsAtCompileTime == Dynamic ? size : ColsAtCompileTime) m_cols(ColsAtCompileTime == Dynamic ? size : ColsAtCompileTime)
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(MatrixType)
ei_assert(size > 0); ei_assert(size > 0);
ei_assert((RowsAtCompileTime == 1 ei_assert(SizeAtCompileTime == Dynamic || SizeAtCompileTime == size);
&& (ColsAtCompileTime == Dynamic || ColsAtCompileTime == size))
|| (ColsAtCompileTime == 1
&& (RowsAtCompileTime == Dynamic || RowsAtCompileTime == size)));
} }
inline Map(const Scalar* data, int rows, int cols) inline Map(const Scalar* data, int rows, int cols)

7
test/inverse.cpp
View File

@ -2,6 +2,7 @@
// for linear algebra. Eigen itself is part of the KDE project. // for linear algebra. Eigen itself is part of the KDE project.
// //
// Copyright (C) 2008 Gael Guennebaud <g.gael@free.fr> // Copyright (C) 2008 Gael Guennebaud <g.gael@free.fr>
// Copyright (C) 2008 Benoit Jacob <jacob@math.jussieu.fr>
// //
// Eigen is free software; you can redistribute it and/or // Eigen is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -53,15 +54,19 @@ template<typename MatrixType> void inverse(const MatrixType& m)
VERIFY_IS_APPROX(identity, m1 * m1.inverse() ); VERIFY_IS_APPROX(identity, m1 * m1.inverse() );
VERIFY_IS_APPROX(m1, m1.inverse().inverse() ); VERIFY_IS_APPROX(m1, m1.inverse().inverse() );
// since for the general case we implement separately row-major and col-major, test that
VERIFY_IS_APPROX(m1.transpose().inverse(), m1.inverse().transpose());
} }
void test_inverse() void test_inverse()
{ {
for(int i = 0; i < 1; i++) { for(int i = 0; i < g_repeat; i++) {
CALL_SUBTEST( inverse(Matrix<double,1,1>()) ); CALL_SUBTEST( inverse(Matrix<double,1,1>()) );
CALL_SUBTEST( inverse(Matrix2d()) ); CALL_SUBTEST( inverse(Matrix2d()) );
CALL_SUBTEST( inverse(Matrix3f()) ); CALL_SUBTEST( inverse(Matrix3f()) );
CALL_SUBTEST( inverse(Matrix4f()) ); CALL_SUBTEST( inverse(Matrix4f()) );
CALL_SUBTEST( inverse(MatrixXf(8,8)) );
CALL_SUBTEST( inverse(MatrixXcd(7,7)) ); CALL_SUBTEST( inverse(MatrixXcd(7,7)) );
} }
} }