Merge #3327

3327: core: Fixed bitwise comparison of floating point numbers r=fweik a=fweik Partial fix for #3315. Co-authored-by: Florian Weik <fweik@icp.uni-stuttgart.de>
espressomd · Nov 20, 2019 · c91ea5e · c91ea5e
2 parents f23a4d0 + c5e3795
commit c91ea5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/core/unit_tests/MpiCallbacks_test.cpp b/src/core/unit_tests/MpiCallbacks_test.cpp
@@ -38,18 +38,18 @@ static bool called = false;
 BOOST_AUTO_TEST_CASE(invoke_test) {
   using Communication::detail::invoke;
 
-  auto f = [](int i, double d) { return i + d; };
+  auto f = [](int i, unsigned j) { return i + j; };
 
   boost::mpi::communicator world;
   boost::mpi::packed_oarchive::buffer_type buff;
 
   auto const i = 123;
-  auto const d = 3.1415;
-  boost::mpi::packed_oarchive(world, buff) << i << d;
+  auto const j = 456u;
+  boost::mpi::packed_oarchive(world, buff) << i << j;
 
   boost::mpi::packed_iarchive ia(world, buff);
 
-  BOOST_CHECK_EQUAL(f(i, d), (invoke<decltype(f), int, double>(f, ia)));
+  BOOST_CHECK_EQUAL(f(i, j), (invoke<decltype(f), int, unsigned>(f, ia)));
 }
 
 /*

diff --git a/src/utils/tests/matrix_vector_product.cpp b/src/utils/tests/matrix_vector_product.cpp
@@ -24,13 +24,16 @@
 
 #include "utils/math/matrix_vector_product.hpp"
 
+#include <limits>
+
 extern constexpr std::array<std::array<int, 3>, 3> matrix{
     {{{1, 2, 9}}, {{8, 41, 6}}, {{31, 15, 99}}}};
 
 BOOST_AUTO_TEST_CASE(inner_product) {
   const std::array<double, 3> vector{{0.5, 1.25, 3.1}};
   auto const result = Utils::matrix_vector_product<double, 3, matrix>(vector);
   for (int i = 0; i < 3; ++i) {
-    BOOST_CHECK(result[i] == boost::inner_product(matrix[i], vector, 0.0));
+    BOOST_CHECK_CLOSE(result[i], boost::inner_product(matrix[i], vector, 0.0),
+                      std::numeric_limits<double>::epsilon());
   }
 }