X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/af35c0c75c52b0cf5d0518656473503f67a79613..db5fb322a04cdb13328247938ec14bbf85fba338:/loba_makhoul.cpp

diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp
index 7309e6c..1807da4 100644
--- a/loba_makhoul.cpp
+++ b/loba_makhoul.cpp
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
@@ -7,17 +6,20 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 void loba_makhoul::load_balance()
 {
-    std::sort(pneigh.begin(), pneigh.end(), pneigh_load_less());
+    pneigh_sort_by_load(std::less<double>());
 
     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());
     }
 }