A
lgorithmique
N
umérique
D
istribuée
Private GIT Repository
projects
/
loba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[loba.git]
/
loba_fairstrategy.cpp
diff --git
a/loba_fairstrategy.cpp
b/loba_fairstrategy.cpp
index a9f8e6048fb379c0d74d5bfed060887a00101c44..4054729142b10a0a835072cd700edf2a99a073cb 100644
(file)
--- a/
loba_fairstrategy.cpp
+++ b/
loba_fairstrategy.cpp
@@
-1,34
+1,23
@@
-#include <algorithm>
#include <xbt/log.h>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
#include "loba_fairstrategy.h"
#include <xbt/log.h>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
#include "loba_fairstrategy.h"
-class compare {
-public:
- bool operator()(const neighbor*a, const neighbor*b) {
- return a->get_load() > b->get_load();
- }
-};
-
void loba_fairstrategy::load_balance()
{
void loba_fairstrategy::load_balance()
{
- const double delta = 0.001;
-
- std::sort(pneigh.begin(), pneigh.end(), compare());
-
+ pneigh_sort_by_load(std::greater<double>());
print_loads_p(false, xbt_log_priority_debug);
print_loads_p(false, xbt_log_priority_debug);
+ const double delta = 0.001;
bool found = true;
bool found = true;
-
while (found) {
found = false;
for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
if (pneigh[i]->get_load() <= get_load() - 2 * delta) {
found = true;
send(pneigh[i], delta);
while (found) {
found = false;
for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
if (pneigh[i]->get_load() <= get_load() - 2 * delta) {
found = true;
send(pneigh[i], delta);
-
DEBUG1
("sent to %s", pneigh[i]->get_name());
+
XBT_DEBUG
("sent to %s", pneigh[i]->get_name());
}
}
}
}
}
}