X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/51909edd89ccd195ba335606743a650807123999..2f365d3503318b9911fe71d29878ea49a753534d:/loba_makhoul.cpp diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp index bbf855f..1807da4 100644 --- a/loba_makhoul.cpp +++ b/loba_makhoul.cpp @@ -11,12 +11,15 @@ void loba_makhoul::load_balance() print_loads_p(false, xbt_log_priority_debug); double alpha = 1.0 / (pneigh.size() + 1.0); - double delta; - for (unsigned i = 0 ; - i < pneigh.size() && - (delta = get_load() - pneigh[i]->get_load()) > 0.0 ; - ++i) { - send(pneigh[i], delta * alpha); + double myLoad = get_load(); + for (unsigned i = 0; i < pneigh.size(); i++) { + double delta = std::max(myLoad - pneigh[i]->get_load(), 0.0); + double transfer = alpha * delta; + XBT_DEBUG("delta = %g ; transfer = %g", delta, transfer); + if (get_load() - 2 * transfer < pneigh[i]->get_load()) + break; + send(pneigh[i], transfer); + XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name()); } }