X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c9a08928e1b55a62536c0ea3b2d3fbf19a5cc487..9104957deccc59e0e804215d5db498fabfd40d29:/src/xbt/random_test.cpp

diff --git a/src/xbt/random_test.cpp b/src/xbt/random_test.cpp
index 01ae026be7..b7c10e8a2c 100644
--- a/src/xbt/random_test.cpp
+++ b/src/xbt/random_test.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2019-2020. The SimGrid Team. All rights reserved.               */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,17 +7,19 @@
 #include "xbt/log.h"
 #include "xbt/random.hpp"
 #include <random>
+#include <cmath>
+
+#define EpsilonApprox(a) Catch::Matchers::WithinAbs((a), 100 * std::numeric_limits<double>::epsilon())
 
 TEST_CASE("xbt::random: Random Number Generation")
 {
   SECTION("Using XBT_RNG_xbt")
   {
     simgrid::xbt::random::set_mersenne_seed(12345);
-
-    REQUIRE(simgrid::xbt::random::exponential(25) == 0.00291934351538427348);
+    REQUIRE_THAT(simgrid::xbt::random::exponential(25), EpsilonApprox(0.00291934351538427348));
     REQUIRE(simgrid::xbt::random::uniform_int(1, 6) == 4);
-    REQUIRE(simgrid::xbt::random::uniform_real(0, 1) == 0.31637556043369124970);
-    REQUIRE(simgrid::xbt::random::normal(0, 2) == 1.62746784745133976635);
+    REQUIRE_THAT(simgrid::xbt::random::uniform_real(0, 1), EpsilonApprox(0.31637556043369124970));
+    REQUIRE_THAT(simgrid::xbt::random::normal(0, 2), EpsilonApprox(1.62746784745133976635));
   }
 
   SECTION("Using XBT_RNG_std")
@@ -26,16 +28,16 @@ TEST_CASE("xbt::random: Random Number Generation")
     gen.seed(12345);
 
     simgrid::xbt::random::set_mersenne_seed(12345);
-    simgrid::xbt::random::use_std();
+    simgrid::xbt::random::set_implem_std();
 
     std::exponential_distribution<> distA(25);
     std::uniform_int_distribution<> distB(1, 6);
     std::uniform_real_distribution<> distC(0, 1);
     std::normal_distribution<> distD(0, 2);
 
-    REQUIRE(simgrid::xbt::random::exponential(25) == distA(gen));
+    REQUIRE_THAT(simgrid::xbt::random::exponential(25), EpsilonApprox(distA(gen)));
     REQUIRE(simgrid::xbt::random::uniform_int(1, 6) == distB(gen));
-    REQUIRE(simgrid::xbt::random::uniform_real(0, 1) == distC(gen));
-    REQUIRE(simgrid::xbt::random::normal(0, 2) == distD(gen));
+    REQUIRE_THAT(simgrid::xbt::random::uniform_real(0, 1), EpsilonApprox(distC(gen)));
+    REQUIRE_THAT(simgrid::xbt::random::normal(0, 2), EpsilonApprox(distD(gen)));
   }
 }