Enforce integer initial load when integer transfers are activated.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 45d06211d7c830d475d4fa01d54c0315cc5c1f70..e6ae2abcdbb2573950534161d56c338f8d512b5a 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
 #include <algorithm>

+#include <cmath>

 #include <functional>
 #include <iterator>
 #include <numeric>
 #include <functional>
 #include <iterator>
 #include <numeric>


@@ -36,6 +37,13 @@ process::process(int argc, char* argv[])
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
         throw std::invalid_argument("bad or missing initial load parameter");
 
     if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))
         throw std::invalid_argument("bad or missing initial load parameter");
 

+    double iload = trunc(real_load);
+    if (opt::integer_transfer && real_load != iload) {
+        XBT_WARN("Initial load %g is not an integer.  Truncate it.",
+                 real_load);
+        real_load = iload;
+    }
+

     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());
     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());


@@ -305,6 +313,8 @@ void process::ctrl_send(neighbor& nb)
 
 double process::compute_load_to_send(double desired)
 {
 
 double process::compute_load_to_send(double desired)
 {

+    if (opt::integer_transfer)
+        desired = std::floor(desired);

     return desired >= opt::min_transfer_amount ? desired : 0.0;
 }
 
     return desired >= opt::min_transfer_amount ? desired : 0.0;
 }