From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Thu, 24 Feb 2011 18:22:32 +0000 (+0100)
Subject: Render algorithm makhoul much more simpler.
X-Git-Tag: v0.1~106
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/7aedebde4d8de8a7b9f0d3ba2dc38f968c739569?ds=inline;hp=--cc

Render algorithm makhoul much more simpler.
---

7aedebde4d8de8a7b9f0d3ba2dc38f968c739569
diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp
index dcce7b7..8ee3b3e 100644
--- a/loba_makhoul.cpp
+++ b/loba_makhoul.cpp
@@ -2,40 +2,26 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
-#include <algorithm>
-#include <tr1/functional>
 #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>());
 
     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);
-    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());
+    double myLoad = get_load();
+    for (unsigned i = 0; i < pneigh.size(); i++) {
+        double delta = std::max(myLoad - pneigh[i]->get_load(), 0.0);
+        double transfer = alpha * delta;
+        XBT_DEBUG("delta = %g ; transfer = %g", delta, transfer);
+        if (pneigh[i]->get_load() <= get_load() - 2 * transfer) {
+            send(pneigh[i], transfer);
+            XBT_DEBUG("sent %g to %s", transfer, pneigh[i]->get_name());
+        } else {
+            break;
+        }
     }
 }