Fixed a couple of issues introduced in previous commits.

Added a test for Triangular.
This commit is contained in:
Gael Guennebaud
2008-04-26 20:28:27 +00:00
parent b4c974d059
commit 1ec2d21ca5
7 changed files with 53 additions and 29 deletions

View File

@@ -7,6 +7,7 @@ FIND_PACKAGE(Qt4 REQUIRED)
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
SET(test_SRCS
triangular.cpp
main.cpp
basicstuff.cpp
linearstructure.cpp

View File

@@ -40,21 +40,32 @@ template<typename MatrixType> void nullDeterminant(const MatrixType& m)
typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, MatrixType::ColsAtCompileTime> SquareMatrixType;
typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, 1> VectorType;
MatrixType d(rows, cols);
MatrixType dinv(rows, cols), dnotinv(rows, cols);
// build a ill-conditionned matrix with a nul determinant
d.col(0).setOnes();
d.block(0,1, rows, cols-2).setRandom();
d.col(cols-1).setOnes();
dinv.col(0).setOnes();
dinv.block(0,1, rows, cols-2).setRandom();
dnotinv.col(0).setOnes();
dnotinv.block(0,1, rows, cols-2).setRandom();
dnotinv.col(cols-1).setOnes();
for (int i=0 ; i<rows ; ++i)
d.row(i).block(0,1,1,cols-2) = d.row(i).block(0,1,1,cols-2).normalized();
{
dnotinv.row(i).block(0,1,1,cols-2) = ei_random<Scalar>(99.999999,100.00000001)*dnotinv.row(i).block(0,1,1,cols-2).normalized();
dnotinv(i,cols-1) = dnotinv.row(i).block(0,1,1,cols-2).norm2();
dinv(i,cols-1) = dinv.row(i).block(0,1,1,cols-2).norm2();
}
SquareMatrixType covarianceMatrix = d.transpose() * d;
SquareMatrixType invertibleCovarianceMatrix = dinv.transpose() * dinv;
SquareMatrixType notInvertibleCovarianceMatrix = dnotinv.transpose() * dnotinv;
// std::cout << covarianceMatrix << "\n" << covarianceMatrix.determinant() << "\n";
std::cout << notInvertibleCovarianceMatrix << "\n" << notInvertibleCovarianceMatrix.determinant() << "\n";
VERIFY_IS_APPROX(covarianceMatrix.determinant(), Scalar(0));
VERIFY_IS_APPROX(notInvertibleCovarianceMatrix.determinant(), Scalar(0));
VERIFY(invertibleCovarianceMatrix.inverse().exists());
VERIFY(!notInvertibleCovarianceMatrix.inverse().exists());
}
void EigenTest::testDeterminant()

View File

@@ -32,7 +32,7 @@
#include <ctime>
#include <iostream>
#define DEFAULT_REPEAT 50
#define DEFAULT_REPEAT 10
#ifndef EIGEN_NO_ASSERTION_CHECKING
@@ -214,6 +214,7 @@ class EigenTest : public QObject
void testMap();
void testCwiseops();
void testDeterminant();
void testTriangular();
protected:
int m_repeat;
};