One more bug :(

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index 81de9e100a7e0941fbe0974e35d9c56e949cb7f3..4054729142b10a0a835072cd700edf2a99a073cb 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -1,61 +1,26 @@
-#include "loba_fairstrategy.h"
-#include <algorithm>

 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 

-/* simple version:
- *   load balance with a least-loaded neighbor,
- *   without breaking the ping-pong condition
- */
-
-class compare {
-public : 
-       bool operator()(const neighbor*a, const neighbor*b)     {
-               return a->get_load()>b->get_load();
-       }
-};
+#include "loba_fairstrategy.h"

 
 

-double loba_fairstrategy::load_balance(double my_load)
+void loba_fairstrategy::load_balance()

 {
 {

-    int imin = -1;
-    int imax = -1;
-    double min = my_load;
-    double max = -1.0;
-
-               std::sort(pneigh.begin(),pneigh.end(),compare());
-
-               //print_loads();
-
-               INFO0("list voisins");
-               for(unsigned i=0;i< pneigh.size() ; ++i) {
-                       INFO2("%s %f ", pneigh[i]->get_name(), pneigh[i]->get_load());
-               }
-
-               double sum_sent=0;
-               bool found=true;
-
-               while(found) {
-                       found=false;
-                       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);
-                                       pneigh[i]->add_to_send(1);
-                                       INFO1("sent to %s",pneigh[i]->get_name());
-                                       my_load--;
-                                       sum_sent++;
-                               }
-                       }
-               }
-
-
-               
-               return sum_sent;
-    
+    pneigh_sort_by_load(std::greater<double>());
+    print_loads_p(false, xbt_log_priority_debug);
+
+    const double delta = 0.001;
+    bool found = true;
+    while (found) {
+        found = false;
+        for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
+            if (pneigh[i]->get_load() <= get_load() - 2 * delta) {
+                found = true;
+                send(pneigh[i], delta);
+                XBT_DEBUG("sent to %s", pneigh[i]->get_name());
+            }
+        }
+    }

 }
 
 // Local variables:
 }
 
 // Local variables: