new tests

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 27c3a1bc9e1a9905ff2e26e1fe6eff3757058d57..5d0f98bc5da9fa2532cec0cc0533414a325a146d 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -323,13 +323,18 @@ void process::data_send(neighbor& nb)
 {
     double load_to_send;
     if (opt::bookkeeping) {     // bookkeeping
 {
     double load_to_send;
     if (opt::bookkeeping) {     // bookkeeping

-        double excess_load;
+        double excess_load;     // load amount we are able to send

         if (opt::egocentric)
             excess_load = std::max(0.0, real_load - expected_load);
         else
             excess_load = real_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()));
+
+        double balance = nb.get_debt() - nb.get_credit();
+        load_to_send = std::min(excess_load,
+                                std::max(0.0, balance));
+
+        // adjust load to send (rounding, truncation, etc.)
+        load_to_send = compute_load_to_send(load_to_send);

         if (load_to_send > 0.0)
             nb.set_debt(nb.get_debt() - load_to_send);
     } else {                    // !bookkeeping
         if (load_to_send > 0.0)
             nb.set_debt(nb.get_debt() - load_to_send);
     } else {                    // !bookkeeping