ajout de 8 fichiers de tests (a mon avis leur duree de vie sera tres courte :-) )

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index 8f52806bb15fc591f28b6c5c6215466fb4770627..264224cb0cea2f83d4ab8ab831f217ae626f5831 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <cmath>
 #include <cstdlib>
 #include <functional>
 #include <iomanip>
@@ -63,6 +64,27 @@ void deployment_generator::distribute_load()
         std::accumulate(loads.begin(), loads.end(), 0.0);
     std::transform(loads.begin(), loads.end(), loads.begin(),
                    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 = floor(loads[i]);
+            else if (residue > 0.0)
+                iload = ceil(loads[i]);
+            else // residue == 0.0
+                iload = round(loads[i]);
+            residue += (loads[i] - iload);
+            loads[i] = iload;
+        }
+        // abs(round(...)) to avoid rounding errors, or a value of -0
+        iload = abs(round(loads[i] + residue)); // i == hosts.size() - 1
+        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]);
 }