mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
merging.
This commit is contained in:
@@ -45,12 +45,14 @@ template<> struct adjoint_specific<false> {
|
||||
|
||||
// check null inputs
|
||||
VERIFY_IS_APPROX((v1*0).normalized(), (v1*0));
|
||||
#if (!EIGEN_ARCH_i386) || defined(EIGEN_VECTORIZE)
|
||||
RealScalar very_small = (std::numeric_limits<RealScalar>::min)();
|
||||
VERIFY( (v1*very_small).norm() == 0 );
|
||||
VERIFY_IS_APPROX((v1*very_small).normalized(), (v1*very_small));
|
||||
v3 = v1*very_small;
|
||||
v3.normalize();
|
||||
VERIFY_IS_APPROX(v3, (v1*very_small));
|
||||
#endif
|
||||
|
||||
// check compatibility of dot and adjoint
|
||||
ref = NumTraits<Scalar>::IsInteger ? 0 : (std::max)((std::max)(v1.norm(),v2.norm()),(std::max)((square * v2).norm(),(square.adjoint() * v1).norm()));
|
||||
|
||||
@@ -48,30 +48,32 @@ void testVectorType(const VectorType& base)
|
||||
VectorType m(base);
|
||||
m.setLinSpaced(size,low,high);
|
||||
|
||||
if(!NumTraits<Scalar>::IsInteger)
|
||||
{
|
||||
VectorType n(size);
|
||||
for (int i=0; i<size; ++i)
|
||||
n(i) = low+i*step;
|
||||
VERIFY_IS_APPROX(m,n);
|
||||
}
|
||||
|
||||
VectorType n(size);
|
||||
for (int i=0; i<size; ++i)
|
||||
n(i) = low+i*step;
|
||||
|
||||
n(i) = size==1 ? low : (low + ((high-low)*Scalar(i))/(size-1));
|
||||
VERIFY_IS_APPROX(m,n);
|
||||
|
||||
// random access version
|
||||
m = VectorType::LinSpaced(size,low,high);
|
||||
VERIFY_IS_APPROX(m,n);
|
||||
|
||||
// Assignment of a RowVectorXd to a MatrixXd (regression test for bug #79).
|
||||
VERIFY( (MatrixXd(RowVectorXd::LinSpaced(3, 0, 1)) - RowVector3d(0, 0.5, 1)).norm() < std::numeric_limits<Scalar>::epsilon() );
|
||||
|
||||
// These guys sometimes fail! This is not good. Any ideas how to fix them!?
|
||||
//VERIFY( m(m.size()-1) == high );
|
||||
//VERIFY( m(0) == low );
|
||||
VERIFY( internal::isApprox(m(m.size()-1),high) );
|
||||
VERIFY( size==1 || internal::isApprox(m(0),low) );
|
||||
|
||||
// sequential access version
|
||||
m = VectorType::LinSpaced(Sequential,size,low,high);
|
||||
VERIFY_IS_APPROX(m,n);
|
||||
|
||||
// These guys sometimes fail! This is not good. Any ideas how to fix them!?
|
||||
//VERIFY( m(m.size()-1) == high );
|
||||
//VERIFY( m(0) == low );
|
||||
VERIFY( internal::isApprox(m(m.size()-1),high) );
|
||||
VERIFY( size==1 || internal::isApprox(m(0),low) );
|
||||
|
||||
// check whether everything works with row and col major vectors
|
||||
Matrix<Scalar,Dynamic,1> row_vector(size);
|
||||
@@ -126,5 +128,13 @@ void test_nullary()
|
||||
CALL_SUBTEST_8( testVectorType(Vector4f()) );
|
||||
CALL_SUBTEST_8( testVectorType(Matrix<float,8,1>()) );
|
||||
CALL_SUBTEST_8( testVectorType(Matrix<float,1,1>()) );
|
||||
|
||||
CALL_SUBTEST_9( testVectorType(VectorXi(internal::random<int>(1,300))) );
|
||||
CALL_SUBTEST_9( testVectorType(Matrix<int,1,1>()) );
|
||||
}
|
||||
|
||||
#ifdef EIGEN_TEST_PART_6
|
||||
// Assignment of a RowVectorXd to a MatrixXd (regression test for bug #79).
|
||||
VERIFY( (MatrixXd(RowVectorXd::LinSpaced(3, 0, 1)) - RowVector3d(0, 0.5, 1)).norm() < std::numeric_limits<double>::epsilon() );
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -192,6 +192,11 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
|
||||
VERIFY_IS_APPROX(refM4.cwiseProduct(m3), refM4.cwiseProduct(refM3));
|
||||
// VERIFY_IS_APPROX(m3.cwise()/refM4, refM3.cwise()/refM4);
|
||||
|
||||
VERIFY_IS_APPROX(refM4 + m3, refM4 + refM3);
|
||||
VERIFY_IS_APPROX(m3 + refM4, refM3 + refM4);
|
||||
VERIFY_IS_APPROX(refM4 - m3, refM4 - refM3);
|
||||
VERIFY_IS_APPROX(m3 - refM4, refM3 - refM4);
|
||||
|
||||
// test aliasing
|
||||
VERIFY_IS_APPROX((m1 = -m1), (refM1 = -refM1));
|
||||
VERIFY_IS_APPROX((m1 = m1.transpose()), (refM1 = refM1.transpose().eval()));
|
||||
@@ -455,6 +460,33 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
|
||||
refMat1.setIdentity();
|
||||
VERIFY_IS_APPROX(m1, refMat1);
|
||||
}
|
||||
|
||||
// test array/vector of InnerIterator
|
||||
{
|
||||
typedef typename SparseMatrixType::InnerIterator IteratorType;
|
||||
|
||||
DenseMatrix refMat2 = DenseMatrix::Zero(rows, cols);
|
||||
SparseMatrixType m2(rows, cols);
|
||||
initSparse<Scalar>(density, refMat2, m2);
|
||||
IteratorType static_array[2];
|
||||
static_array[0] = IteratorType(m2,0);
|
||||
static_array[1] = IteratorType(m2,m2.outerSize()-1);
|
||||
VERIFY( static_array[0] || m2.innerVector(static_array[0].outer()).nonZeros() == 0 );
|
||||
VERIFY( static_array[1] || m2.innerVector(static_array[1].outer()).nonZeros() == 0 );
|
||||
if(static_array[0] && static_array[1])
|
||||
{
|
||||
++(static_array[1]);
|
||||
static_array[1] = IteratorType(m2,0);
|
||||
VERIFY( static_array[1] );
|
||||
VERIFY( static_array[1].index() == static_array[0].index() );
|
||||
VERIFY( static_array[1].outer() == static_array[0].outer() );
|
||||
VERIFY( static_array[1].value() == static_array[0].value() );
|
||||
}
|
||||
|
||||
std::vector<IteratorType> iters(2);
|
||||
iters[0] = IteratorType(m2,0);
|
||||
iters[1] = IteratorType(m2,m2.outerSize()-1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -174,7 +174,8 @@ template<typename MatrixType> void stable_norm(const MatrixType& m)
|
||||
VERIFY_IS_APPROX(vcopy.norm(), RealScalar(1));
|
||||
VERIFY_IS_APPROX((vbig.stableNormalized()).norm(), RealScalar(1));
|
||||
VERIFY_IS_APPROX((vsmall.stableNormalized()).norm(), RealScalar(1));
|
||||
VERIFY_IS_APPROX(vbig, vbig.stableNorm() * vbig.stableNormalized());
|
||||
RealScalar big_scaling = ((std::numeric_limits<RealScalar>::max)() * RealScalar(1e-4));
|
||||
VERIFY_IS_APPROX(vbig/big_scaling, (vbig.stableNorm() * vbig.stableNormalized()).eval()/big_scaling);
|
||||
VERIFY_IS_APPROX(vsmall, vsmall.stableNorm() * vsmall.stableNormalized());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ template<typename MatrixType> void zeroReduction(const MatrixType& m) {
|
||||
template<typename MatrixType> void zeroSizedMatrix()
|
||||
{
|
||||
MatrixType t1;
|
||||
typedef typename MatrixType::Scalar Scalar;
|
||||
|
||||
if (MatrixType::SizeAtCompileTime == Dynamic || MatrixType::SizeAtCompileTime == 0)
|
||||
{
|
||||
@@ -45,6 +46,23 @@ template<typename MatrixType> void zeroSizedMatrix()
|
||||
VERIFY(t1==t2);
|
||||
}
|
||||
}
|
||||
|
||||
if(MatrixType::MaxColsAtCompileTime!=0 && MatrixType::MaxRowsAtCompileTime!=0)
|
||||
{
|
||||
Index rows = MatrixType::RowsAtCompileTime==Dynamic ? internal::random<Index>(1,10) : MatrixType::RowsAtCompileTime;
|
||||
Index cols = MatrixType::ColsAtCompileTime==Dynamic ? internal::random<Index>(1,10) : MatrixType::ColsAtCompileTime;
|
||||
MatrixType m(rows,cols);
|
||||
zeroReduction(m.template block<0,MatrixType::ColsAtCompileTime>(0,0,0,cols));
|
||||
zeroReduction(m.template block<MatrixType::RowsAtCompileTime,0>(0,0,rows,0));
|
||||
zeroReduction(m.template block<0,1>(0,0));
|
||||
zeroReduction(m.template block<1,0>(0,0));
|
||||
Matrix<Scalar,Dynamic,Dynamic> prod = m.template block<MatrixType::RowsAtCompileTime,0>(0,0,rows,0) * m.template block<0,MatrixType::ColsAtCompileTime>(0,0,0,cols);
|
||||
VERIFY(prod.rows()==rows && prod.cols()==cols);
|
||||
VERIFY(prod.isZero());
|
||||
prod = m.template block<1,0>(0,0) * m.template block<0,1>(0,0);
|
||||
VERIFY(prod.size()==1);
|
||||
VERIFY(prod.isZero());
|
||||
}
|
||||
}
|
||||
|
||||
template<typename VectorType> void zeroSizedVector()
|
||||
|
||||
Reference in New Issue
Block a user