[sonar] Constify pointer and reference parameters in src/xbt/dict.cpp.

[simgrid.git] / src / xbt / random.cpp

diff --git a/src/xbt/random.cpp b/src/xbt/random.cpp
index 63d5353..e7ba9e2 100644 (file)
--- a/src/xbt/random.cpp
+++ b/src/xbt/random.cpp
@@ -11,32 +11,47 @@
 namespace simgrid {
 namespace xbt {
 namespace random {
-std::mt19937 mt19937_gen;
+enum xbt_random_implem { XBT_RNG_xbt, XBT_RNG_std };
+static xbt_random_implem rng_implem = XBT_RNG_xbt;
+
+static std::mt19937 mt19937_gen;
+
+void set_implem_xbt()
+{
+  rng_implem = XBT_RNG_xbt;
+}
+void set_implem_std()
+{
+  rng_implem = XBT_RNG_std;
+}
+void set_mersenne_seed(int seed)
+{
+  mt19937_gen.seed(seed);
+}
 
 int uniform_int(int min, int max)
 {
-  unsigned long gmin   = mt19937_gen.min();
-  unsigned long gmax   = mt19937_gen.max();
-  unsigned long grange = gmax - gmin + 1;
+  if (rng_implem == XBT_RNG_std) {
+    std::uniform_int_distribution<> dist(min, max);
+    return dist(mt19937_gen);
+    }
+
   unsigned long range  = max - min + 1;
+  unsigned long value  = mt19937_gen();
+  xbt_assert(range > 0, "Overflow in the uniform integer distribution, please use a smaller range.");
   xbt_assert(
-      min < max || min == max,
+      min <= max,
       "The maximum value for the uniform integer distribution must be greater than or equal to the minimum value");
-  xbt_assert(range < grange || range == grange, "The current implementation of the uniform integer distribution does "
-                                                "not allow range to be higher than mt19937's range");
-  unsigned long mult       = grange / range;
-  unsigned long maxallowed = gmin + (mult + 1) * range - 1;
-  while (true) {
-    unsigned long value = mt19937_gen();
-    if (value > maxallowed) {
-    } else {
-      return value % range + min;
-    }
-  }
+  return value % range + min;
 }
 
 double uniform_real(double min, double max)
 {
+  if (rng_implem == XBT_RNG_std) {
+    std::uniform_real_distribution<> dist(min, max);
+    return dist(mt19937_gen);
+    }
+
   // This reuses Boost's uniform real distribution ideas
   unsigned long numerator = mt19937_gen() - mt19937_gen.min();
   unsigned long divisor   = mt19937_gen.max() - mt19937_gen.min();
@@ -45,11 +60,21 @@ double uniform_real(double min, double max)
 
 double exponential(double lambda)
 {
+  if (rng_implem == XBT_RNG_std) {
+    std::exponential_distribution<> dist(lambda);
+    return dist(mt19937_gen);
+    }
+
   return -1 / lambda * log(uniform_real(0, 1));
 }
 
 double normal(double mean, double sd)
 {
+  if (rng_implem == XBT_RNG_std) {
+    std::normal_distribution<> dist(mean, sd);
+    return dist(mt19937_gen);
+  }
+
   double u1 = 0;
   while (u1 < std::numeric_limits<double>::min()) {
     u1 = uniform_real(0, 1);
@@ -59,11 +84,6 @@ double normal(double mean, double sd)
   return z0 * sd + mean;
 }
 
-void set_mersenne_seed(int seed)
-{
-  mt19937_gen.seed(seed);
-}
-
 } // namespace random
 } // namespace xbt
 } // namespace simgrid