In make_params, extract common options from template file.

[loba.git] / loba_makhoul.cpp

diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp
index dcce7b730d90c30203dbc084454149ccd0b76ab6..cfc9483c66bbc06895b25b535fc7e0e70e05abe9 100644 (file)
--- a/loba_makhoul.cpp
+++ b/loba_makhoul.cpp
@@ -2,40 +2,28 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 

-#include <algorithm>
-#include <tr1/functional>

 #include "loba_makhoul.h"
 
 void loba_makhoul::load_balance()
 {
 #include "loba_makhoul.h"
 
 void loba_makhoul::load_balance()
 {

-    using std::tr1::bind;
-    using std::tr1::placeholders::_1;
-    using std::tr1::placeholders::_2;
-

     pneigh_sort_by_load(std::less<double>());
     pneigh_sort_by_load(std::less<double>());

-

     print_loads_p(false, xbt_log_priority_debug);
 
     print_loads_p(false, xbt_log_priority_debug);
 

-    // find limit between least loaded neighbors, and more loaded ones
-    pneigh_type::iterator bound =
-        std::lower_bound(pneigh.begin(), pneigh.end(),
-                         get_load(),
-                         bind(std::less<double>(),
-                              bind(&neighbor::get_load, _1), _2));
-
-    // compute load differences
-    std::vector<double> delta(bound - pneigh.begin());
-    std::transform(pneigh.begin(), bound, delta.begin(),
-                   bind(std::minus<double>(),
-                        get_load(), bind(&neighbor::get_load, _1)));
-
-    // send load...

     double alpha = 1.0 / (pneigh.size() + 1.0);
     double alpha = 1.0 / (pneigh.size() + 1.0);

+    double my_load = get_load();
+    bool cont = true;

     for (unsigned i = 0 ;
     for (unsigned i = 0 ;

-         i < delta.size() && pneigh[i]->get_load() < get_load() ; ++i) {
-        double balance = delta[i] * alpha;
-        send(pneigh[i], balance);
-        XBT_DEBUG("sent %g to %s", balance, pneigh[i]->get_name());
+         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);
+        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;
+        }

     }
 }
 
     }
 }