From 7aedebde4d8de8a7b9f0d3ba2dc38f968c739569 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 24 Feb 2011 19:22:32 +0100 Subject: [PATCH 1/1] Render algorithm makhoul much more simpler. --- loba_makhoul.cpp | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp index dcce7b7..8ee3b3e 100644 --- a/loba_makhoul.cpp +++ b/loba_makhoul.cpp @@ -2,40 +2,26 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba); -#include -#include #include "loba_makhoul.h" void loba_makhoul::load_balance() { - using std::tr1::bind; - using std::tr1::placeholders::_1; - using std::tr1::placeholders::_2; - pneigh_sort_by_load(std::less()); print_loads_p(false, xbt_log_priority_debug); - // find limit between least loaded neighbors, and more loaded ones - pneigh_type::iterator bound = - std::lower_bound(pneigh.begin(), pneigh.end(), - get_load(), - bind(std::less(), - bind(&neighbor::get_load, _1), _2)); - - // compute load differences - std::vector delta(bound - pneigh.begin()); - std::transform(pneigh.begin(), bound, delta.begin(), - bind(std::minus(), - get_load(), bind(&neighbor::get_load, _1))); - - // send load... double alpha = 1.0 / (pneigh.size() + 1.0); - for (unsigned i = 0 ; - i < delta.size() && pneigh[i]->get_load() < get_load() ; ++i) { - double balance = delta[i] * alpha; - send(pneigh[i], balance); - XBT_DEBUG("sent %g to %s", balance, pneigh[i]->get_name()); + 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 (pneigh[i]->get_load() <= get_load() - 2 * transfer) { + send(pneigh[i], transfer); + XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name()); + } else { + break; + } } } -- 2.39.5