--- trunk/test/math/VectorTestCase.cpp 2004/10/21 21:31:39 137 +++ trunk/test/math/VectorTestCase.cpp 2009/11/25 20:02:06 1390 @@ -188,11 +188,11 @@ void VectorTestCase::testAccessEntries(){ void VectorTestCase::testAccessEntries(){ //test [] operator - CPPUNIT_ASSERT_DOUBLES_EQUAL(zero[0], 0.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(one[0] , 1.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(v3[0] , 4.0, oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(zero[0], 0.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(one[0] , 1.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(v3[0] , 4.0, OpenMD::NumericConstant::epsilon); //test () operator - CPPUNIT_ASSERT_DOUBLES_EQUAL(v3(0) , 4.0, oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(v3(0) , 4.0, OpenMD::NumericConstant::epsilon); Vec4 a1; double *pa1 = a1.getArrayPointer(); @@ -207,14 +207,14 @@ void VectorTestCase::testOtherMemberFunctions(){ void VectorTestCase::testOtherMemberFunctions(){ //test length() - CPPUNIT_ASSERT_DOUBLES_EQUAL(zero.length(), 0.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(one.length(), 2.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(v2.length(), sqrt(14.0), oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(zero.length(), 0.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(one.length(), 2.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(v2.length(), sqrt(14.0), OpenMD::NumericConstant::epsilon); //test lengthSquare() - CPPUNIT_ASSERT_DOUBLES_EQUAL(zero.lengthSquare(), 0.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(one.lengthSquare(), 4.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(v2.lengthSquare(), 14.0, oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(zero.lengthSquare(), 0.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(one.lengthSquare(), 4.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(v2.lengthSquare(), 14.0, OpenMD::NumericConstant::epsilon); //test normalize() Vec4 a1 = one; @@ -227,20 +227,26 @@ void VectorTestCase::testOtherMemberFunctions(){ //test isNormalized(); CPPUNIT_ASSERT(a1.isNormalized()); CPPUNIT_ASSERT(!one.isNormalized()); - + //test getArray + double tempV[4]; + v3.getArray(tempV); + CPPUNIT_ASSERT_DOUBLES_EQUAL(tempV[0], v3[0], OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(tempV[1], v3[1], OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(tempV[2], v3[2], OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(tempV[3], v3[3], OpenMD::NumericConstant::epsilon); } void VectorTestCase::testOtherTemplateFunctions(){ //test dot - CPPUNIT_ASSERT_DOUBLES_EQUAL(dot(one, two), 8.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(dot(v1, v3), 20.0, oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(dot(one, two), 8.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(dot(v1, v3), 20.0, OpenMD::NumericConstant::epsilon); //test distance - CPPUNIT_ASSERT_DOUBLES_EQUAL(distance(one, two), 2.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(distance(v1, v2), sqrt(56.0), oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(distance(one, two), 2.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(distance(v1, v2), sqrt(56.0), OpenMD::NumericConstant::epsilon); //test distanceSquare - CPPUNIT_ASSERT_DOUBLES_EQUAL(distanceSquare(one, two), 4.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(distanceSquare(v1, v2), 56, oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(distanceSquare(one, two), 4.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(distanceSquare(v1, v2), 56, OpenMD::NumericConstant::epsilon); }