mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-02-17 18:09:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

* fix compilation of unit-tests (sorry, had tested only 1 channel)

Browse Source 
* remove buggy (superfluous?) specialization in the meta-unroller
This commit is contained in:
Benoit Jacob 2009-11-19 19:20:19 -05:00
parent a20a744adc
commit 88b551e89b
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Eigen/src/Core/TriangularMatrix.h
View File

@ -343,21 +343,6 @@ struct ei_triangular_assignment_selector
}
};
template<typename Derived1, typename Derived2, unsigned int Mode, bool ClearOpposite>
struct ei_triangular_assignment_selector<Derived1, Derived2, Mode, 1, ClearOpposite>
{
inline static void run(Derived1 &dst, const Derived2 &src)
{
if(Mode&UnitDiagBit)
{
if(ClearOpposite)
dst.coeffRef(0, 0) = 1;
}
else if(!(Mode & ZeroDiagBit))
dst.copyCoeff(0, 0, src);
}
};
// prevent buggy user code from causing an infinite recursion
template<typename Derived1, typename Derived2, unsigned int Mode, bool ClearOpposite>
struct ei_triangular_assignment_selector<Derived1, Derived2, Mode, 0, ClearOpposite>

28
test/triangular.cpp
View File

@ -141,7 +141,10 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m)
{
typedef typename MatrixType::Scalar Scalar;
typedef typename NumTraits<Scalar>::Real RealScalar;
typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType;
enum { Rows = MatrixType::RowsAtCompileTime, Cols = MatrixType::ColsAtCompileTime };
typedef Matrix<Scalar, Rows, 1> VectorType;
typedef Matrix<Scalar, Rows, Rows> RMatrixType;
int rows = m.rows();
int cols = m.cols();
@ -153,10 +156,10 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m)
r1(rows, cols),
r2(rows, cols),
mzero = MatrixType::Zero(rows, cols),
mones = MatrixType::Ones(rows, cols),
identity = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
mones = MatrixType::Ones(rows, cols);
RMatrixType identity = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
::Identity(rows, rows),
square = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
square = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
::Random(rows, rows);
VectorType v1 = VectorType::Random(rows),
v2 = VectorType::Random(rows),
@ -172,8 +175,6 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m)
VERIFY(!m2.isLowerTriangular());
}
// VERIFY_IS_APPROX(m1up.transpose() * m2, m1.upper().transpose().lower() * m2);
// test overloaded operator+=
r1.setZero();
r2.setZero();
@ -227,25 +228,30 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m)
m3.setZero();
m3.template triangularView<UpperTriangular>().setOnes();
VERIFY_IS_APPROX(m2,m3);
}
void test_triangular()
{
for(int i = 0; i < g_repeat ; i++) {
for(int i = 0; i < g_repeat ; i++)
{
#ifdef EIGEN_TEST_PART_7
int r = ei_random<int>(2,20);
int c = ei_random<int>(2,20);
#endif
CALL_SUBTEST_1( triangular_square(Matrix<float, 1, 1>()) );
CALL_SUBTEST_2( triangular_square(Matrix<float, 2, 2>()) );
CALL_SUBTEST_3( triangular_square(Matrix3d()) );
CALL_SUBTEST_4( triangular_square(MatrixXcf(4, 4)) );
CALL_SUBTEST_5( triangular_square(Matrix<std::complex<float>,8, 8>()) );
CALL_SUBTEST_6( triangular_square(MatrixXcd(17,17)) );
CALL_SUBTEST_7( triangular_square(Matrix<float,Dynamic,Dynamic,RowMajor>(5, 5)) );
CALL_SUBTEST_7( triangular_square(Matrix<float,Dynamic,Dynamic,RowMajor>(r, r)) );
CALL_SUBTEST_8( triangular_rect(Matrix<float, 4, 5>()) );
CALL_SUBTEST_9( triangular_rect(Matrix<double, 6, 2>()) );
CALL_SUBTEST_4( triangular_rect(MatrixXcf(4, 10)) );
CALL_SUBTEST_6( triangular_rect(MatrixXcd(11, 3)) );
CALL_SUBTEST_7( triangular_rect(Matrix<float,Dynamic,Dynamic,RowMajor>(7, 6)) );
CALL_SUBTEST_7( triangular_rect(Matrix<float,Dynamic,Dynamic,RowMajor>(r, c)) );
}
}