Minor fixes (cosmetics only).

diff --git a/TODO b/TODO
index 448d380f4c65e1b3138754913580e6195dfdc2b4..50395d15266171ac72c1adbc2780e4b5dabbddb7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -13,6 +13,7 @@
 
 * Support heterogeneous platforms?
    Not sure yet.
 
 * Support heterogeneous platforms?
    Not sure yet.

+   Should be doable if each process also sends its speed to its neighbors.

 
 * Add options -j/-J : minimum number of iterations?
 
 
 * Add options -j/-J : minimum number of iterations?
 

diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp
index 1807da410d935ffdf278da856909c9bb815eb4c5..fc25653f6051afe2d66e66521c33b67aaff6ffa5 100644 (file)
--- a/loba_makhoul.cpp
+++ b/loba_makhoul.cpp
@@ -11,15 +11,20 @@ void loba_makhoul::load_balance()
     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 (get_load() - 2 * transfer < pneigh[i]->get_load())
-            break;
-        send(pneigh[i], transfer);
-        XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name());
+        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;
+        }

     }
 }
 
     }
 }
 

diff --git a/loba_makhoul2.cpp b/loba_makhoul2.cpp
index 6d7d12edb914ef77156b4869723af47c4a56f9aa..d0cf20a636b9cf11917b499a47baf7fa83850e68 100644 (file)
--- a/loba_makhoul2.cpp
+++ b/loba_makhoul2.cpp
@@ -16,11 +16,14 @@ void loba_makhoul2::load_balance()
     double neighborLoadMax = 0.0; // maximum load of neighbors to
                                   // which something has been sent
     for (unsigned i = 0;
     double neighborLoadMax = 0.0; // maximum load of neighbors to
                                   // which something has been sent
     for (unsigned i = 0;

-         i < pneigh.size() && pneigh[i]->get_load() < get_load(); i++) {
+         i < pneigh.size() && pneigh[i]->get_load() < get_load(); ++i)
+    {
+

         double delta = get_load() - pneigh[i]->get_load();
 
         // do not violate ping-pong condition
         double transfer = std::min(alpha * delta, get_load() - neighborLoadMax);
         double delta = get_load() - pneigh[i]->get_load();
 
         // do not violate ping-pong condition
         double transfer = std::min(alpha * delta, get_load() - neighborLoadMax);

+        // note: alpha <= 1/2

         XBT_DEBUG("delta = %g ; transfer = %g", delta, transfer);
 
         send(pneigh[i], transfer);
         XBT_DEBUG("delta = %g ; transfer = %g", delta, transfer);
 
         send(pneigh[i], transfer);