diff --git a/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp b/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp index 86bc7d46f697c8bc769eba4e8c8481a2e3eee4ce..a2a96fe3f75381a37494b93b1851e866d8782189 100644 --- a/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp +++ b/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp @@ -41,7 +41,7 @@ TEST_F(FFSpecializationTest, AnisoPyramidAsPyramid) const double L = 1.5, H = .24, alpha = .6; FormFactorAnisoPyramid p0(L, L, H, alpha); FormFactorPyramid p1(L, H, alpha); - run_test(&p0, &p1, eps_polyh, 1e-99, 5e3); + run_test(&p0, &p1, eps_polyh, 1e-99, 50); } TEST_F(FFSpecializationTest, Pyramid3AsPrism) @@ -49,7 +49,7 @@ TEST_F(FFSpecializationTest, Pyramid3AsPrism) const double L = 1.8, H = .3; FormFactorTetrahedron p0(L, H, M_PI / 2); FormFactorPrism3 p1(L, H); - run_test(&p0, &p1, eps_polyh, 1e-99, 5e3); + run_test(&p0, &p1, eps_polyh, 1e-99, 50); } TEST_F(FFSpecializationTest, PyramidAsBox) @@ -83,7 +83,7 @@ TEST_F(FFSpecializationTest, EllipsoidalCylinderAsCylinder) const double R = .8, H = 1.2; FormFactorEllipsoidalCylinder p0(R, R, H); FormFactorCylinder p1(R, H); - run_test(&p0, &p1, 1e-11, 1e-99, 5e3); + run_test(&p0, &p1, 1e-11, 1e-99, 50); } TEST_F(FFSpecializationTest, TruncatedSphereAsSphere) @@ -91,7 +91,7 @@ TEST_F(FFSpecializationTest, TruncatedSphereAsSphere) const double R = 1.; FormFactorTruncatedSphere p0(R, 2 * R); FormFactorFullSphere p1(R); - run_test(&p0, &p1, 1e-12, .02, 5e1); + run_test(&p0, &p1, 1e-11, .02, 5e1); } TEST_F(FFSpecializationTest, SpheroidAsSphere) @@ -99,5 +99,5 @@ TEST_F(FFSpecializationTest, SpheroidAsSphere) const double R = 1.; FormFactorFullSpheroid p0(R, 2 * R); FormFactorFullSphere p1(R); - run_test(&p0, &p1, 1e-12, 1e-99, 5e3); + run_test(&p0, &p1, 1e-12, 1e-99, 50); } diff --git a/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp b/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp index efe7426573c397f121d5551a7bdd2089d09691c7..db8fb3a8d58fec8ec8125c9785aaaee85cfd7eab 100644 --- a/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp +++ b/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp @@ -42,10 +42,10 @@ TEST_F(FFSymmetryTest, Prism6) FormFactorPrism6 p(1.33, .42); run_test( &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(M_PI / 3); }, 1e-12, 1e-99, - 2e3); + 50); run_test( &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(-M_TWOPI / 3); }, 3.8e-12, - 1e-99, 2e3); + 1e-99, 50); } TEST_F(FFSymmetryTest, Tetrahedron) @@ -62,16 +62,16 @@ TEST_F(FFSymmetryTest, Cone6_flat) // TODO for larger q, imag(ff) is nan FormFactorCone6 p(4.3, .09, .1); run_test( - &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(-M_PI / 3); }, 3.8e-12, 1e-99, - 2e2); + &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(-M_PI / 3); }, 1e-11, 1e-99, + 50); } TEST_F(FFSymmetryTest, Cone6_steep) { FormFactorCone6 p(.23, 3.5, .999 * M_PI / 2); run_test( - &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(-M_PI / 3); }, 2.5e-12, 1e-99, - 2e2); + &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(-M_PI / 3); }, 4e-12, 1e-99, + 50); } //*********** spheroids *************** @@ -99,7 +99,7 @@ TEST_F(FFSymmetryTest, FullSpheroid) { FormFactorFullSpheroid p(.73, .36); run_test( - &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(.123); }, 1e-13, + &p, [](const cvector_t& q) -> cvector_t { return q.rotatedZ(.123); }, 1e-12, 1e-99, 2e2); }