X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/2e3129cd655efb5ccfa93000546cefd02b725154..8185d5cdd5d8fd1b4c78888a6add91b93f0cfcc0:/loba_makhoul.cpp?ds=sidebyside

diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp
index 67a2359..cfc9483 100644
--- a/loba_makhoul.cpp
+++ b/loba_makhoul.cpp
@@ -1,30 +1,29 @@
-#include <algorithm>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 #include "loba_makhoul.h"
 
-class compare {
-public:
-    bool operator()(const neighbor*a, const neighbor*b) {
-        return a->get_load() < b->get_load();
-    }
-};
-
 void loba_makhoul::load_balance()
 {
-    std::sort(pneigh.begin(), pneigh.end(), compare());
-
+    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;
+    double my_load = get_load();
+    bool cont = true;
     for (unsigned i = 0 ;
-         i < pneigh.size() &&
-             (delta = get_load() - pneigh[i]->get_load()) > 0.0 ;
-         ++i) {
-        send(pneigh[i], delta * alpha);
+         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 (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;
+        }
     }
 }