From f483eedcc241fabb1210b5800d903989202ad9fe Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Fri, 25 Feb 2011 15:00:53 +0100
Subject: [PATCH 1/1] Minor fixes (cosmetics only).
---
TODO | 1 +
loba_makhoul.cpp | 19 ++++++++++++-------
loba_makhoul2.cpp | 5 ++++-
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/TODO b/TODO
index 448d380..50395d1 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,7 @@
* 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?
diff --git a/loba_makhoul.cpp b/loba_makhoul.cpp
index 1807da4..fc25653 100644
--- 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);
- 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);
- 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 6d7d12e..d0cf20a 100644
--- 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;
- 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);
+ // note: alpha <= 1/2
XBT_DEBUG("delta = %g ; transfer = %g", delta, transfer);
send(pneigh[i], transfer);
--
2.39.5