X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/e53538eff3dccb0bf53d2f3916659f991ae6f6b8..6ad1e94466f69183cec5ce63db62c248e00e5db6:/process.cpp?ds=inline

diff --git a/process.cpp b/process.cpp
index 193c87b..db84ff8 100644
--- a/process.cpp
+++ b/process.cpp
@@ -37,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");
 
+    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);
+        real_load = iload;
+    }
+
     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());
@@ -90,6 +97,7 @@ process::~process()
              lb_iter, comp_iter, real_load);
     XBT_VERB("Expected load was: %g", expected_load);
     XBT_VERB("Total computation for this process: %g", get_comp_amount());
+    print_loads(true, xbt_log_priority_debug);
 }
 
 int process::run()
@@ -314,11 +322,17 @@ double process::compute_load_to_send(double desired)
 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 (opt::bookkeeping) {     // bookkeeping
+        double excess_load;
+        if (opt::egocentric)
+            excess_load = std::max(0.0, real_load - expected_load);
+        else
+            excess_load = real_load;
+        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 {
+    } else {                    // !bookkeeping
         load_to_send = compute_load_to_send(nb.get_to_send());
         if (load_to_send > 0.0)
             nb.set_to_send(nb.get_to_send() - load_to_send);