Bug fix: credit can be negative.

[loba.git] / loba_makhoul.cpp

diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp
index 67a2359c569cf18f669ac17193125e0dfe2cdb36..cfc9483c66bbc06895b25b535fc7e0e70e05abe9 100644 (file)
--- 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"
 
 #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()
 {
 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);
     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 ;
     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;
+        }

     }
 }
 
     }
 }