Use git diff instead of diff-index for setlocalversion.

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index bbb47e5392a1b55d58d5bb16e1e4a31e9b9df2cd..0af3e3b214482d58e372d9b5f7e99856b5b3eb2a 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -1,12 +1,11 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <algorithm>
 #include <cmath>
 #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>
 


@@ -51,8 +50,6 @@ 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;


@@ -67,7 +64,7 @@ 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(),
     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;
     if (opt::integer_transfer) {
         double iload;
         double residue = 0.0;


@@ -96,7 +93,7 @@ void deployment_generator::distribute_load()
 
 void deployment_generator::deploy()
 {
 
 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;
     for (unsigned i = 0 ; i < hosts.size() ; ++i) {
         const char* hostname = hostdata::at(i).get_name();
         std::ostringstream oss;