X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/c8312a5fc4607cd996e6e687c98ee08fd5e8a08b..779b929d3831ca0aea2f667029d6381946c86e01:/loba_makhoul.cpp?ds=inline diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp index 1807da4..cfc9483 100644 --- a/loba_makhoul.cpp +++ b/loba_makhoul.cpp @@ -7,19 +7,23 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba); void loba_makhoul::load_balance() { pneigh_sort_by_load(std::less()); - print_loads_p(false, xbt_log_priority_debug); double alpha = 1.0 / (pneigh.size() + 1.0); - double myLoad = get_load(); - for (unsigned i = 0; i < pneigh.size(); i++) { - double delta = std::max(myLoad - pneigh[i]->get_load(), 0.0); + double my_load = get_load(); + bool cont = true; + for (unsigned i = 0 ; + cont && i < pneigh.size() && pneigh[i]->get_load() < my_load ; ++i) { + + double delta = my_load - pneigh[i]->get_load(); 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()); + if (pneigh[i]->get_load() + transfer <= get_load() - transfer) { + send(pneigh[i], transfer); + XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name()); + } else { + cont = false; + } } }