From 08c615f1e425d6749ef45ffcbf574e550ba02fea Mon Sep 17 00:00:00 2001 From: Jeff Date: Wed, 25 Jun 2014 19:02:57 -0600 Subject: IndexArray is now a typename. Changed interpolate with derivatives test to use VERIFY_IS_APPROX. --- unsupported/test/splines.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'unsupported/test/splines.cpp') diff --git a/unsupported/test/splines.cpp b/unsupported/test/splines.cpp index ece23953a..0b43eefb8 100644 --- a/unsupported/test/splines.cpp +++ b/unsupported/test/splines.cpp @@ -249,7 +249,7 @@ void check_global_interpolation_with_derivatives2d() Eigen::ChordLengths(points, knots); ArrayXXd derivatives = ArrayXXd::Random(dimension, numPoints); - Eigen::IndexArray derivativeIndices(numPoints); + VectorXd derivativeIndices(numPoints); for (Eigen::DenseIndex i = 0; i < numPoints; ++i) derivativeIndices(i) = i; @@ -261,18 +261,21 @@ void check_global_interpolation_with_derivatives2d() { PointType point = spline(knots(i)); PointType referencePoint = points.col(i); - VERIFY((point - referencePoint).matrix().norm() < 1e-10); + VERIFY_IS_APPROX(point, referencePoint); PointType derivative = spline.derivatives(knots(i), 1).col(1); PointType referenceDerivative = derivatives.col(i); - VERIFY((derivative - referenceDerivative).matrix().norm() < 1e-10); + VERIFY_IS_APPROX(derivative, referenceDerivative); } } void test_splines() { - CALL_SUBTEST( eval_spline3d() ); - CALL_SUBTEST( eval_spline3d_onbrks() ); - CALL_SUBTEST( eval_closed_spline2d() ); - CALL_SUBTEST( check_global_interpolation2d() ); - CALL_SUBTEST( check_global_interpolation_with_derivatives2d() ); + for (int i = 0; i < g_repeat; ++i) + { + CALL_SUBTEST( eval_spline3d() ); + CALL_SUBTEST( eval_spline3d_onbrks() ); + CALL_SUBTEST( eval_closed_spline2d() ); + CALL_SUBTEST( check_global_interpolation2d() ); + CALL_SUBTEST( check_global_interpolation_with_derivatives2d() ); + } } -- cgit v1.2.3