Bug fix: only send to a lesser loaded neighbor!

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index ba5a7d9f12720f90050a5fa0e0517bd8ba6e05b9..9942fac1b1847616a9518788df811ceb2d38cb0e 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -11,9 +11,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
  */
 
 class compare {
  */
 
 class compare {

-public : 
-    bool operator()(const neighbor*a, const neighbor*b)        {
-        return a->get_load()>b->get_load();
+public:
+    bool operator()(const neighbor*a, const neighbor*b) {
+        return a->get_load() > b->get_load();

     }
 };
 
     }
 };
 


@@ -23,20 +23,17 @@ double loba_fairstrategy::load_balance(double my_load)
 
     print_loads_p();
 
 
     print_loads_p();
 

-    double sum_sent=0;
-    bool found=true;
-    
-    while(found) {
-        found=false;
+    double sum_sent = 0;
+    bool found = true;
+
+    while (found) {
+        found = false;

         for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
         for (unsigned i = 0 ; i < pneigh.size() ; ++i) {

-            double l = pneigh[i]->get_load();
-            if (l >= my_load)
-                continue;
-            if (l < my_load+2) {
-                found=true;
-                pneigh[i]->set_load(l+1);
+            if (pneigh[i]->get_load() <= my_load - 2) {
+                found = true;
+                pneigh[i]->add_load(1);

                 pneigh[i]->add_to_send(1);
                 pneigh[i]->add_to_send(1);

-                INFO1("sent to %s",pneigh[i]->get_name());
+                INFO1("sent to %s", pneigh[i]->get_name());

                 my_load--;
                 sum_sent++;
             }
                 my_load--;
                 sum_sent++;
             }