Implement random initial load distribution.

[loba.git] / loba_makhoul.cpp

diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp
index 8ee3b3e82dbe579afe2d86f55ba9d9a679811f66..cfc9483c66bbc06895b25b535fc7e0e70e05abe9 100644 (file)
--- a/loba_makhoul.cpp
+++ b/loba_makhoul.cpp
@@ -7,20 +7,22 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 void loba_makhoul::load_balance()
 {
     pneigh_sort_by_load(std::less<double>());
 void loba_makhoul::load_balance()
 {
     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 myLoad = get_load();
-    for (unsigned i = 0; i < pneigh.size(); i++) {
-        double delta = std::max(myLoad - pneigh[i]->get_load(), 0.0);
+    double my_load = get_load();
+    bool cont = true;
+    for (unsigned i = 0 ;
+         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);
         double transfer = alpha * delta;
         XBT_DEBUG("delta = %g ; transfer = %g", delta, transfer);

-        if (pneigh[i]->get_load() <= get_load() - 2 * 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 {
             send(pneigh[i], transfer);
             XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name());
         } else {

-            break;
+            cont = false;

         }
     }
 }
         }
     }
 }