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/product_trmm.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'test/product_trmm.cpp') diff --git a/test/product_trmm.cpp b/test/product_trmm.cpp index e4790fb66..e117f6931 100644 --- a/test/product_trmm.cpp +++ b/test/product_trmm.cpp @@ -32,15 +32,15 @@ template void trmm(int size,int /*othersize*/) typedef Matrix MatrixRowMaj; DenseIndex rows = size; - DenseIndex cols = ei_random(1,size); + DenseIndex cols = internal::random(1,size); MatrixColMaj triV(rows,cols), triH(cols,rows), upTri(cols,rows), loTri(rows,cols), unitUpTri(cols,rows), unitLoTri(rows,cols), strictlyUpTri(cols,rows), strictlyLoTri(rows,cols); MatrixColMaj ge1(rows,cols), ge2(cols,rows), ge3; MatrixRowMaj rge3; - Scalar s1 = ei_random(), - s2 = ei_random(); + Scalar s1 = internal::random(), + s2 = internal::random(); triV.setRandom(); triH.setRandom(); @@ -65,7 +65,7 @@ template void trmm(int size,int /*othersize*/) VERIFY_IS_APPROX( ge3 = ge1.adjoint() * triV.template triangularView(), ge1.adjoint() * loTri); VERIFY_IS_APPROX( ge3 = triH.template triangularView() * ge2.adjoint(), upTri * ge2.adjoint()); VERIFY_IS_APPROX(rge3.noalias() = triH.template triangularView() * ge2.adjoint(), upTri * ge2.adjoint()); - VERIFY_IS_APPROX( ge3 = (s1*triV).adjoint().template triangularView() * ge2.adjoint(), ei_conj(s1) * loTri.adjoint() * ge2.adjoint()); + VERIFY_IS_APPROX( ge3 = (s1*triV).adjoint().template triangularView() * ge2.adjoint(), internal::conj(s1) * loTri.adjoint() * ge2.adjoint()); VERIFY_IS_APPROX(rge3.noalias() = triV.adjoint().template triangularView() * ge2.adjoint(), loTri.adjoint() * ge2.adjoint()); VERIFY_IS_APPROX( ge3 = triH.adjoint().template triangularView() * ge1.adjoint(), upTri.adjoint() * ge1.adjoint()); VERIFY_IS_APPROX(rge3.noalias() = triH.adjoint().template triangularView() * ge1.adjoint(), upTri.adjoint() * ge1.adjoint()); @@ -73,21 +73,21 @@ template void trmm(int size,int /*othersize*/) VERIFY_IS_APPROX( ge3 = triV.template triangularView() * ge2, unitLoTri * ge2); VERIFY_IS_APPROX( rge3.noalias() = ge2 * triV.template triangularView(), ge2 * unitLoTri); VERIFY_IS_APPROX( ge3 = ge2 * triV.template triangularView(), ge2 * unitLoTri); - VERIFY_IS_APPROX( ge3 = (s1*triV).adjoint().template triangularView() * ge2.adjoint(), ei_conj(s1) * unitLoTri.adjoint() * ge2.adjoint()); + VERIFY_IS_APPROX( ge3 = (s1*triV).adjoint().template triangularView() * ge2.adjoint(), internal::conj(s1) * unitLoTri.adjoint() * ge2.adjoint()); VERIFY_IS_APPROX( ge3 = triV.template triangularView() * ge2, strictlyLoTri * ge2); VERIFY_IS_APPROX( rge3.noalias() = ge2 * triV.template triangularView(), ge2 * strictlyLoTri); VERIFY_IS_APPROX( ge3 = ge2 * triV.template triangularView(), ge2 * strictlyLoTri); - VERIFY_IS_APPROX( ge3 = (s1*triV).adjoint().template triangularView() * ge2.adjoint(), ei_conj(s1) * strictlyLoTri.adjoint() * ge2.adjoint()); + VERIFY_IS_APPROX( ge3 = (s1*triV).adjoint().template triangularView() * ge2.adjoint(), internal::conj(s1) * strictlyLoTri.adjoint() * ge2.adjoint()); } void test_product_trmm() { for(int i = 0; i < g_repeat ; i++) { - CALL_SUBTEST_1((trmm(ei_random(1,320),ei_random(1,320)))); - CALL_SUBTEST_2((trmm(ei_random(1,320),ei_random(1,320)))); - CALL_SUBTEST_3((trmm >(ei_random(1,200),ei_random(1,200)))); - CALL_SUBTEST_4((trmm >(ei_random(1,200),ei_random(1,200)))); + CALL_SUBTEST_1((trmm(internal::random(1,320),internal::random(1,320)))); + CALL_SUBTEST_2((trmm(internal::random(1,320),internal::random(1,320)))); + CALL_SUBTEST_3((trmm >(internal::random(1,200),internal::random(1,200)))); + CALL_SUBTEST_4((trmm >(internal::random(1,200),internal::random(1,200)))); } } -- cgit v1.2.3