From: Arnaud Giersch Date: Mon, 19 Sep 2011 14:17:05 +0000 (+0200) Subject: Use credit to try to avoid useless transfers. X-Git-Tag: exp_20120216~49 X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/b0b2d9cb57d83fcdfb92837561ffb5dbab288323?ds=sidebyside Use credit to try to avoid useless transfers. --- diff --git a/process.cpp b/process.cpp index 27c3a1b..5d0f98b 100644 --- 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 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; - 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