X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/03a16acd38dfaa266986de5d73f4a90c0ddbfeb1..c7d143b408d7ebd1136daa8d0e6c1b708826b475:/process.cpp?ds=sidebyside diff --git a/process.cpp b/process.cpp index e6ae2ab..1883464 100644 --- 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,7 +322,13 @@ 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())); + 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 {