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

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index e6ae2abcdbb2573950534161d56c338f8d512b5a..0f7380c8c4802a7cecf5f7498deb3deaa32c0863 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -37,7 +37,7 @@ 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");
 
-    double iload = trunc(real_load);
+    double iload = std::trunc(real_load);
     if (opt::integer_transfer && real_load != iload) {
         XBT_WARN("Initial load %g is not an integer.  Truncate it.",
                  real_load);
@@ -322,9 +322,14 @@ void process::data_send(neighbor& nb)
 {
     double load_to_send;
     if (opt::bookkeeping) {
-        load_to_send = compute_load_to_send(std::min(real_load, nb.get_debt()));
-        if (load_to_send > 0.0)
-            nb.set_debt(nb.get_debt() - load_to_send);
+        double excess_load = real_load - expected_load;
+        if (excess_load > 0.0) {
+            load_to_send = compute_load_to_send(std::min(excess_load,
+                                                         nb.get_debt()));
+            if (load_to_send > 0.0)
+                nb.set_debt(nb.get_debt() - load_to_send);
+        } else
+            load_to_send = 0.0;
     } else {
         load_to_send = compute_load_to_send(nb.get_to_send());
         if (load_to_send > 0.0)