Version 0.4.

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index 0b3042350db373fb6b13bdf9d83e087935400a17..287ca4f88fb2432a5c7f710b52ed2dc7606bb379 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,11 +1,11 @@
 #include <algorithm>
 #include <algorithm>

+#include <cmath>

 #include <cstdlib>
 #include <cstdlib>

-#include <functional>

 #include <iomanip>
 #include <numeric>
 #include <sstream>
 #include <vector>
 #include <iomanip>
 #include <numeric>
 #include <sstream>
 #include <vector>

-#include <msg/msg.h>
+#include <simgrid/msg.h>

 #include <xbt/dynar.h>
 #include <xbt/log.h>
 
 #include <xbt/dynar.h>
 #include <xbt/log.h>
 


@@ -50,35 +50,38 @@ void deployment_generator::set_link(int host1, int host2)
 
 void deployment_generator::distribute_load()
 {
 
 void deployment_generator::distribute_load()
 {

-    using std::placeholders::_1;
-

     if (!opt::auto_depl::random_distribution) {
         set_load(0, opt::auto_depl::load);
         return;
     }
     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::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(),
     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;
         unsigned i;
         for (i = 0 ; i < hosts.size() - 1; ++i) {
             if (residue < 0.0)
     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]);
+                iload = std::floor(loads[i]);

             else if (residue > 0.0)
             else if (residue > 0.0)

-                iload = ceil(loads[i]);
+                iload = std::ceil(loads[i]);

             else // residue == 0.0
             else // residue == 0.0

-                iload = round(loads[i]);
+                iload = std::round(loads[i]);

             residue += (loads[i] - iload);
             loads[i] = iload;
         }
         // abs(round(...)) to avoid rounding errors, or a value of -0
             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
+        // 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 ==
         loads[i] = iload;
         // final sanity check
         xbt_assert(opt::auto_depl::load ==


@@ -180,7 +183,7 @@ void deployment_torus::generate()
             b = c;
     }
     unsigned width = b;
             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",
 
     unsigned first_on_last_line = (size() - 1) - (size() - 1) % width;
     XBT_DEBUG("torus size = %zu ; width = %u ; height = %zu ; foll = %u",