Use git diff instead of diff-index for setlocalversion.

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index 705c1ea859539b528810cad95040ac55c9789ca2..0af3e3b214482d58e372d9b5f7e99856b5b3eb2a 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,11 +1,11 @@
 #include <algorithm>
+#include <cmath>
 #include <cstdlib>
-#include <tr1/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>
 
@@ -50,27 +50,50 @@ void deployment_generator::set_link(int host1, int host2)
 
 void deployment_generator::distribute_load()
 {
-    using std::tr1::bind;
-    using std::tr1::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(),
-                   bind(std::multiplies<double>(), _1, factor));
+                   [&factor](double a) { return factor * a; });
+    if (opt::integer_transfer) {
+        double iload;
+        double residue = 0.0;
+        unsigned i;
+        for (i = 0 ; i < hosts.size() - 1; ++i) {
+            if (residue < 0.0)
+                iload = std::floor(loads[i]);
+            else if (residue > 0.0)
+                iload = std::ceil(loads[i]);
+            else // residue == 0.0
+                iload = std::round(loads[i]);
+            residue += (loads[i] - iload);
+            loads[i] = iload;
+        }
+        // abs(round(...)) to avoid rounding errors, or a value of -0
+        // Note: i == hosts.size() - 1
+        iload = std::abs(std::round(loads[i] + residue));
+        loads[i] = iload;
+        // final sanity check
+        xbt_assert(opt::auto_depl::load ==
+                   std::accumulate(loads.begin(), loads.end(), 0.0));
+    }
     for (unsigned i = 0 ; i < hosts.size() ; ++i)
         set_load(i, loads[i]);
 }
 
 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;
@@ -160,7 +183,7 @@ void deployment_torus::generate()
             b = c;
     }
     unsigned width = b;
-    // here width == ceil(sqrt(size))
+    // here width == std::ceil(std::sqrt(size))
 
     unsigned first_on_last_line = (size() - 1) - (size() - 1) % width;
     XBT_DEBUG("torus size = %zu ; width = %u ; height = %zu ; foll = %u",