Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba

[loba.git] / deployment.cpp

diff --git a/deployment.cpp b/deployment.cpp
index 264224cb0cea2f83d4ab8ab831f217ae626f5831..f34c3a93e36803b7b2ee0c930cfd1deb5c88ee4c 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -70,16 +70,17 @@ void deployment_generator::distribute_load()
         unsigned i;
         for (i = 0 ; i < hosts.size() - 1; ++i) {
             if (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 ==


@@ -181,7 +182,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",