Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index 9942fac1b1847616a9518788df811ceb2d38cb0e..7e02a21361c646ea6aabc18e084d7233cc2ab219 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -17,30 +17,25 @@ public:
     }
 };
 
-double loba_fairstrategy::load_balance(double my_load)
+void loba_fairstrategy::load_balance()
 {
     std::sort(pneigh.begin(), pneigh.end(), compare());
 
-    print_loads_p();
+               // print_loads_p();
+    //print_loads_p(false, xbt_log_priority_debug);
 
-    double sum_sent = 0;
     bool found = true;
 
     while (found) {
         found = false;
         for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
-            if (pneigh[i]->get_load() <= my_load - 2) {
+            if (pneigh[i]->get_load() <= get_load() - 2) {
                 found = true;
-                pneigh[i]->add_load(1);
-                pneigh[i]->add_to_send(1);
-                INFO1("sent to %s", pneigh[i]->get_name());
-                my_load--;
-                sum_sent++;
+                send(pneigh[i], 1);
+                DEBUG1("sent to %s", pneigh[i]->get_name());
             }
         }
     }
-
-    return sum_sent;
 }
 
 // Local variables: