--- trunk/test/math/RectMatrixTestCase.cpp 2004/10/25 22:46:19 151 +++ trunk/test/math/RectMatrixTestCase.cpp 2009/11/25 20:02:06 1390 @@ -250,7 +250,7 @@ void RectMatrixTestCase::testAccessEntries(){ } void RectMatrixTestCase::testAccessEntries(){ - CPPUNIT_ASSERT_DOUBLES_EQUAL(m1(1, 0), 3.0, oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(m1(1, 0), 3.0, OpenMD::NumericConstant::epsilon); } void RectMatrixTestCase::testRowColOperations() { @@ -260,9 +260,9 @@ void RectMatrixTestCase::testRowColOperations() { //test getRow row = e.getRow(0); - CPPUNIT_ASSERT_DOUBLES_EQUAL(row[0], 2.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(row[1], 4.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(row[2], 1.0, oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(row[0], 2.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(row[1], 4.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(row[2], 1.0, OpenMD::NumericConstant::epsilon); //test setRow row[0] = 2.0; row[1] = 4.0; @@ -279,23 +279,23 @@ void RectMatrixTestCase::testRowColOperations() { CPPUNIT_ASSERT(m == e); //test getCol - col = e.getColum(1); - CPPUNIT_ASSERT_DOUBLES_EQUAL(col[0], 4.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(col[1], 0.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(col[2], 6.0, oopse::epsilon); + col = e.getColumn(1); + CPPUNIT_ASSERT_DOUBLES_EQUAL(col[0], 4.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(col[1], 0.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(col[2], 6.0, OpenMD::NumericConstant::epsilon); //test setCol col[0] = 2.0; col[1] = 0.0; col[2] = 0.0; - m.setColum(0, col); + m.setColumn(0, col); col[0] = 4.0; col[1] = 0.0; col[2] = 6.0; - m.setColum(1, col); + m.setColumn(1, col); col[0] = 1.0; col[1] = 3.0; col[2] = 5.0; - m.setColum(2, col); + m.setColumn(2, col); CPPUNIT_ASSERT(m == e); //test swapRow @@ -321,7 +321,7 @@ void RectMatrixTestCase::testRowColOperations() { s(2, 1) = 0.0; s(2, 2) = 5.0; - s.swapColum(0, 1); + s.swapColumn(0, 1); CPPUNIT_ASSERT(s == e); double* p = s.getArrayPointer(); @@ -349,9 +349,9 @@ void RectMatrixTestCase::testOtherMemberFunctions(){ double tmp[4]; m4.getArray(tmp); - CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[0], -1.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[1], -1.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[2], -3.0, oopse::epsilon); - CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[3], -1.0, oopse::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[0], -1.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[1], -1.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[2], -3.0, OpenMD::NumericConstant::epsilon); + CPPUNIT_ASSERT_DOUBLES_EQUAL(tmp[3], -1.0, OpenMD::NumericConstant::epsilon); }