Display load average and standard deviation at the end.

[loba.git] / loba_simple.cpp

diff --git a/loba_simple.cpp b/loba_simple.cpp
index 7d4937c234696b5128e924db1acd8c337e1be70a..5702fba8a667fb76d6c982bd495769f1363adec2 100644 (file)
--- a/loba_simple.cpp
+++ b/loba_simple.cpp
@@ -1,9 +1,9 @@
-#include "loba_simple.h"
-

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

+#include "loba_simple.h"
+

 /* simple version:
  *   load balance with a least-loaded neighbor,
  *   without breaking the ping-pong condition
 /* simple version:
  *   load balance with a least-loaded neighbor,
  *   without breaking the ping-pong condition


@@ -14,8 +14,8 @@ double loba_simple::load_balance(double my_load)
     int imax = -1;
     double min = my_load;
     double max = -1.0;
     int imax = -1;
     double min = my_load;
     double max = -1.0;

-    for (unsigned i = 0 ; i < neigh.size() ; ++i) {
-        double l = neigh[i].get_load();
+    for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
+        double l = pneigh[i]->get_load();

         if (l >= my_load)
             continue;
         if (l < min) {
         if (l >= my_load)
             continue;
         if (l < min) {


@@ -29,9 +29,10 @@ double loba_simple::load_balance(double my_load)
     }
     if (imin != -1) {
         // found someone
     }
     if (imin != -1) {
         // found someone

-        double balance = (my_load - max) / 2;
+        double balance = (my_load - min) / 2;

         DEBUG6("%d:%g %d:%g %g %g", imin, min, imax, max, my_load, balance);
         DEBUG6("%d:%g %d:%g %g %g", imin, min, imax, max, my_load, balance);

-        neigh[imin].set_to_send(balance);
+        pneigh[imin]->set_to_send(balance);
+        pneigh[imin]->add_load(balance);

         return balance;
     } else {
         return 0.0;
         return balance;
     } else {
         return 0.0;