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

diff --git a/deployment.cpp b/deployment.cpp
index 705c1ea..f34c3a9 100644
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,6 +1,7 @@
 #include <algorithm>
+#include <cmath>
 #include <cstdlib>
-#include <tr1/functional>
+#include <functional>
 #include <iomanip>
 #include <numeric>
 #include <sstream>
@@ -50,8 +51,7 @@ void deployment_generator::set_link(int host1, int host2)
 
 void deployment_generator::distribute_load()
 {
-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
+    using std::placeholders::_1;
 
     if (!opt::auto_depl::random_distribution) {
         set_load(0, opt::auto_depl::load);
@@ -63,7 +63,29 @@ void deployment_generator::distribute_load()
     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));
+                   std::bind(std::multiplies<double>(), _1, factor));
+    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]);
 }
@@ -160,7 +182,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",