Merge pull request #359 from peastman/master

Fixed some overly stringent tests

Merge pull request #359 from peastman/master
Fixed some overly stringent tests
42dfb1d7 · peastman · 74ed6b1f · 55237c86 · 42dfb1d7
Commit 42dfb1d7 authored Mar 06, 2014 by peastman
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

platforms/reference/tests/TestReferenceCustomNonbondedForce.cpp ...rms/reference/tests/TestReferenceCustomNonbondedForce.cpp +3 -3

No files found.
--- a/platforms/reference/tests/TestReferenceCustomNonbondedForce.cpp
+++ b/platforms/reference/tests/TestReferenceCustomNonbondedForce.cpp
@@ -398,7 +398,7 @@ void testDiscrete1DFunction() {
        const vector<Vec3>& forces = state.getForces();
        ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[0], 1e-6);
        ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], 1e-6);
-        ASSERT_EQUAL(table[i]+1.0, state.getPotentialEnergy());
+        ASSERT_EQUAL_TOL(table[i]+1.0, state.getPotentialEnergy(), 1e-6);
    }
 }

@@ -431,7 +431,7 @@ void testDiscrete2DFunction() {
        const vector<Vec3>& forces = state.getForces();
        ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[0], 1e-6);
        ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], 1e-6);
-        ASSERT_EQUAL(table[i]+1.0, state.getPotentialEnergy());
+        ASSERT_EQUAL_TOL(table[i]+1.0, state.getPotentialEnergy(), 1e-6);
    }
 }

@@ -468,7 +468,7 @@ void testDiscrete3DFunction() {
        const vector<Vec3>& forces = state.getForces();
        ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[0], 1e-6);
        ASSERT_EQUAL_VEC(Vec3(0, 0, 0), forces[1], 1e-6);
-        ASSERT_EQUAL(table[i]+1.0, state.getPotentialEnergy());
+        ASSERT_EQUAL_TOL(table[i]+1.0, state.getPotentialEnergy(), 1e-6);
    }
 }