X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/170f768cfb3e06f5d870854928bc04cfcddcef52..29e444d885c6079db52621b1edfd4f5411ef7bff:/src/xbt/random.cpp

diff --git a/src/xbt/random.cpp b/src/xbt/random.cpp
index 5621f5a345..5160ba3c7f 100644
--- a/src/xbt/random.cpp
+++ b/src/xbt/random.cpp
@@ -19,7 +19,7 @@ namespace simgrid {
 namespace xbt {
 namespace random {
 
-bool Random::read_state(std::string filename)
+bool Random::read_state(const std::string& filename)
 {
   std::ifstream file(filename);
   file >> mt19937_gen;
@@ -29,7 +29,7 @@ bool Random::read_state(std::string filename)
   return not file.fail();
 }
 
-bool Random::write_state(std::string filename)
+bool Random::write_state(const std::string& filename) const
 {
   std::ofstream file(filename);
   file << mt19937_gen;
@@ -73,7 +73,7 @@ int XbtRandom::uniform_int(int min, int max)
   do {
     value = mt19937_gen();
   } while (value >= decltype(mt19937_gen)::max() - decltype(mt19937_gen)::max() % range);
-  return value % range + min;
+  return static_cast<int>(value % range + min);
 }
 
 double XbtRandom::uniform_real(double min, double max)
@@ -84,7 +84,7 @@ double XbtRandom::uniform_real(double min, double max)
   do {
     numerator = mt19937_gen() - decltype(mt19937_gen)::min();
   } while (numerator == divisor);
-  return min + (max - min) * numerator / divisor;
+  return min + (max - min) * static_cast<double>(numerator) / divisor;
 }
 
 double XbtRandom::exponential(double lambda)
@@ -103,15 +103,15 @@ double XbtRandom::normal(double mean, double sd)
   return z0 * sd + mean;
 }
 
-static std::unique_ptr<Random> default_random(new XbtRandom);
+static std::unique_ptr<Random> default_random = std::make_unique<XbtRandom>();
 
 void set_implem_xbt()
 {
-  default_random.reset(new XbtRandom);
+  default_random = std::make_unique<XbtRandom>();
 }
 void set_implem_std()
 {
-  default_random.reset(new StdRandom);
+  default_random = std::make_unique<StdRandom>();
 }
 
 void set_mersenne_seed(int seed)
@@ -119,12 +119,12 @@ void set_mersenne_seed(int seed)
   default_random->set_seed(seed);
 }
 
-bool read_mersenne_state(std::string filename)
+bool read_mersenne_state(const std::string& filename)
 {
   return default_random->read_state(filename);
 }
 
-bool write_mersenne_state(std::string filename)
+bool write_mersenne_state(const std::string& filename)
 {
   return default_random->write_state(filename);
 }