maintainer: fix shape test and vec_rotate test.

espressomd · Mar 3, 2020 · 1ebbf40 · 1ebbf40
1 parent 6dea6cf
commit 1ebbf40
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/samples/visualization_constraints.py b/samples/visualization_constraints.py
@@ -52,6 +52,7 @@
     system,
     background_color=[1, 1, 1],
     drag_enabled=True,
+    quality_constraints=200,
     rasterize_resolution=50.0,
     rasterize_pointsize=5,
     camera_position=[150, 25, 25],

diff --git a/src/shapes/unit_tests/HollowConicalFrustum_test.cpp b/src/shapes/unit_tests/HollowConicalFrustum_test.cpp
@@ -33,6 +33,8 @@ BOOST_AUTO_TEST_CASE(dist_function) {
   constexpr double R1 = 2.0;
   constexpr double R2 = 3.0;
 
+  constexpr double eps = 100 * std::numeric_limits<double>::epsilon();
+
   {
     Shapes::HollowConicalFrustum c;
     c.set_r1(R1);
@@ -45,24 +47,24 @@ BOOST_AUTO_TEST_CASE(dist_function) {
     double dist;
 
     c.calculate_dist(pos, dist, vec);
-    BOOST_TEST(dist == 2.0, boost::test_tools::tolerance(1e-7));
-    BOOST_TEST(dist == vec.norm(), boost::test_tools::tolerance(1e-7));
+    BOOST_CHECK_CLOSE(dist, 2.0, eps);
+    BOOST_CHECK_CLOSE(dist, vec.norm(), eps);
 
     pos = {{R1, 0.0, L / 2.0}};
     c.calculate_dist(pos, dist, vec);
-    BOOST_TEST(dist == 0.0, boost::test_tools::tolerance(1e-7));
-    BOOST_TEST(dist == vec.norm(), boost::test_tools::tolerance(1e-7));
+    BOOST_CHECK_SMALL(dist, eps);
+    BOOST_CHECK_CLOSE(dist, vec.norm(), eps);
 
     pos = {{3.0, 0.0, -L / 2.0}};
     c.calculate_dist(pos, dist, vec);
-    BOOST_TEST(dist == 0.0, boost::test_tools::tolerance(1e-7));
-    BOOST_TEST(dist == vec.norm(), boost::test_tools::tolerance(1e-7));
+    BOOST_CHECK_SMALL(dist, eps);
+    BOOST_CHECK_CLOSE(dist, vec.norm(), eps);
 
     c.set_thickness(1.0);
     c.set_r2(R1);
     pos = {{R1 + 1.0, 0.0, L / 2.0}};
     c.calculate_dist(pos, dist, vec);
-    BOOST_TEST(dist == .5, boost::test_tools::tolerance(1e-7));
+    BOOST_CHECK_CLOSE(dist, .5, eps);
   }
   {
     Shapes::HollowConicalFrustum c;
@@ -76,17 +78,17 @@ BOOST_AUTO_TEST_CASE(dist_function) {
     double dist;
 
     c.calculate_dist(pos, dist, vec);
-    BOOST_TEST(dist == 2.0, boost::test_tools::tolerance(1e-7));
-    BOOST_TEST(dist == vec.norm(), boost::test_tools::tolerance(1e-7));
+    BOOST_CHECK_CLOSE(dist, 2.0, eps);
+    BOOST_CHECK_CLOSE(dist, vec.norm(), eps);
 
     pos = {{L / 2.0, R1, 0.0}};
     c.calculate_dist(pos, dist, vec);
-    BOOST_TEST(dist == 0.0, boost::test_tools::tolerance(1e-7));
-    BOOST_TEST(dist == vec.norm(), boost::test_tools::tolerance(1e-7));
+    BOOST_CHECK_SMALL(dist, eps);
+    BOOST_CHECK_CLOSE(dist, vec.norm(), eps);
 
     pos = {{-L / 2.0, R2, 0.0}};
     c.calculate_dist(pos, dist, vec);
-    BOOST_TEST(dist == 0.0, boost::test_tools::tolerance(1e-7));
-    BOOST_TEST(dist == vec.norm(), boost::test_tools::tolerance(1e-7));
+    BOOST_CHECK_SMALL(dist, eps);
+    BOOST_CHECK_CLOSE(dist, vec.norm(), eps);
   }
 }
diff --git a/src/utils/tests/vec_rotate_test.cpp b/src/utils/tests/vec_rotate_test.cpp
@@ -19,11 +19,11 @@
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 
-#include "utils/math/vec_rotate.hpp"
+#include <utils/constants.hpp>
+#include <utils/math/vec_rotate.hpp>
 using Utils::vec_rotate;
 
 #include <cmath>
-#include <iostream>
 #include <limits>
 
 BOOST_AUTO_TEST_CASE(rotation) {
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(rotation_params) {
   double angle;
   Utils::Vector3d rotation_axis;
   std::tie(angle, rotation_axis) = Utils::rotation_params(v1, v2);
-  BOOST_TEST(angle == M_PI_4, boost::test_tools::tolerance(1e-7));
-  BOOST_TEST((rotation_axis * v1) == 0, boost::test_tools::tolerance(1e-7));
-  BOOST_TEST((rotation_axis * v2) == 0, boost::test_tools::tolerance(1e-7));
+  BOOST_CHECK_CLOSE(angle, Utils::pi() / 4.0, 1e-7);
+  BOOST_CHECK_CLOSE((rotation_axis * v1), 0.0, 1e-7);
+  BOOST_CHECK_CLOSE((rotation_axis * v2), 0.0, 1e-7);
 }