From 4716040703be1ee906439385d20475dcddad5ce3 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Mon, 25 Oct 2010 10:15:22 -0400 Subject: bug #86 : use internal:: namespace instead of ei_ prefix --- test/stable_norm.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'test/stable_norm.cpp') diff --git a/test/stable_norm.cpp b/test/stable_norm.cpp index f3e671c3b..69e4a1b12 100644 --- a/test/stable_norm.cpp +++ b/test/stable_norm.cpp @@ -55,7 +55,7 @@ template void stable_norm(const MatrixType& m) Index rows = m.rows(); Index cols = m.cols(); - Scalar big = ei_random() * (std::numeric_limits::max() * RealScalar(1e-4)); + Scalar big = internal::random() * (std::numeric_limits::max() * RealScalar(1e-4)); Scalar small = static_cast(1)/big; MatrixType vzero = MatrixType::Zero(rows, cols), @@ -75,33 +75,33 @@ template void stable_norm(const MatrixType& m) // test isFinite VERIFY(!isFinite( std::numeric_limits::infinity())); - VERIFY(!isFinite(ei_sqrt(-ei_abs(big)))); + VERIFY(!isFinite(internal::sqrt(-internal::abs(big)))); // test overflow - VERIFY(isFinite(ei_sqrt(size)*ei_abs(big))); + VERIFY(isFinite(internal::sqrt(size)*internal::abs(big))); #ifdef EIGEN_VECTORIZE_SSE // since x87 FPU uses 80bits of precision overflow is not detected - if(ei_packet_traits::size>1) + if(internal::packet_traits::size>1) { - VERIFY_IS_NOT_APPROX(static_cast(vbig.norm()), ei_sqrt(size)*big); // here the default norm must fail + VERIFY_IS_NOT_APPROX(static_cast(vbig.norm()), internal::sqrt(size)*big); // here the default norm must fail } #endif - VERIFY_IS_APPROX(vbig.stableNorm(), ei_sqrt(size)*ei_abs(big)); - VERIFY_IS_APPROX(vbig.blueNorm(), ei_sqrt(size)*ei_abs(big)); - VERIFY_IS_APPROX(vbig.hypotNorm(), ei_sqrt(size)*ei_abs(big)); + VERIFY_IS_APPROX(vbig.stableNorm(), internal::sqrt(size)*internal::abs(big)); + VERIFY_IS_APPROX(vbig.blueNorm(), internal::sqrt(size)*internal::abs(big)); + VERIFY_IS_APPROX(vbig.hypotNorm(), internal::sqrt(size)*internal::abs(big)); // test underflow - VERIFY(isFinite(ei_sqrt(size)*ei_abs(small))); + VERIFY(isFinite(internal::sqrt(size)*internal::abs(small))); #ifdef EIGEN_VECTORIZE_SSE // since x87 FPU uses 80bits of precision underflow is not detected - if(ei_packet_traits::size>1) + if(internal::packet_traits::size>1) { - VERIFY_IS_NOT_APPROX(static_cast(vsmall.norm()), ei_sqrt(size)*small); // here the default norm must fail + VERIFY_IS_NOT_APPROX(static_cast(vsmall.norm()), internal::sqrt(size)*small); // here the default norm must fail } #endif - VERIFY_IS_APPROX(vsmall.stableNorm(), ei_sqrt(size)*ei_abs(small)); - VERIFY_IS_APPROX(vsmall.blueNorm(), ei_sqrt(size)*ei_abs(small)); - VERIFY_IS_APPROX(vsmall.hypotNorm(), ei_sqrt(size)*ei_abs(small)); + VERIFY_IS_APPROX(vsmall.stableNorm(), internal::sqrt(size)*internal::abs(small)); + VERIFY_IS_APPROX(vsmall.blueNorm(), internal::sqrt(size)*internal::abs(small)); + VERIFY_IS_APPROX(vsmall.hypotNorm(), internal::sqrt(size)*internal::abs(small)); // Test compilation of cwise() version VERIFY_IS_APPROX(vrand.colwise().stableNorm(), vrand.colwise().norm()); @@ -117,8 +117,8 @@ void test_stable_norm() for(int i = 0; i < g_repeat; i++) { CALL_SUBTEST_1( stable_norm(Matrix()) ); CALL_SUBTEST_2( stable_norm(Vector4d()) ); - CALL_SUBTEST_3( stable_norm(VectorXd(ei_random(10,2000))) ); - CALL_SUBTEST_4( stable_norm(VectorXf(ei_random(10,2000))) ); - CALL_SUBTEST_5( stable_norm(VectorXcd(ei_random(10,2000))) ); + CALL_SUBTEST_3( stable_norm(VectorXd(internal::random(10,2000))) ); + CALL_SUBTEST_4( stable_norm(VectorXf(internal::random(10,2000))) ); + CALL_SUBTEST_5( stable_norm(VectorXcd(internal::random(10,2000))) ); } } -- cgit v1.2.3