X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/befaff140ab7a986e45c3e4d73ab5ed17eab3e8d..HEAD:/deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index f34c3a9..0af3e3b 100644
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,12 +1,11 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
-#include <functional>
 #include <iomanip>
 #include <numeric>
 #include <sstream>
 #include <vector>
-#include <msg/msg.h>
+#include <simgrid/msg.h>
 #include <xbt/dynar.h>
 #include <xbt/log.h>
 
@@ -51,19 +50,21 @@ void deployment_generator::set_link(int host1, int host2)
 
 void deployment_generator::distribute_load()
 {
-    using std::placeholders::_1;
-
     if (!opt::auto_depl::random_distribution) {
         set_load(0, opt::auto_depl::load);
         return;
     }
-    srand48(opt::auto_depl::random_seed);
     std::vector<double> loads(hosts.size());
-    std::generate(loads.begin(), loads.end(), drand48);
+    if (opt::auto_depl::random_seed != 1) {
+        srand48(opt::auto_depl::random_seed);
+        std::generate(loads.begin(), loads.end(), drand48);
+    } else {
+        std::fill(loads.begin(), loads.end(), 1.0);
+    }
     double factor = opt::auto_depl::load /
         std::accumulate(loads.begin(), loads.end(), 0.0);
     std::transform(loads.begin(), loads.end(), loads.begin(),
-                   std::bind(std::multiplies<double>(), _1, factor));
+                   [&factor](double a) { return factor * a; });
     if (opt::integer_transfer) {
         double iload;
         double residue = 0.0;
@@ -92,7 +93,7 @@ void deployment_generator::distribute_load()
 
 void deployment_generator::deploy()
 {
-    xbt_dynar_t args = xbt_dynar_new(sizeof(const char*), NULL);
+    xbt_dynar_t args = xbt_dynar_new(sizeof(const char*), nullptr);
     for (unsigned i = 0 ; i < hosts.size() ; ++i) {
         const char* hostname = hostdata::at(i).get_name();
         std::ostringstream oss;