X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/dad7be6bee684505c05fae88ff0c89a02db422eb..487f2d9b9eab8937cd512d3a9ee9e057e9edfebd:/loba_fairstrategy.cpp?ds=sidebyside diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp index a9f8e60..5530f5a 100644 --- a/loba_fairstrategy.cpp +++ b/loba_fairstrategy.cpp @@ -1,22 +1,14 @@ -#include #include 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() { const double delta = 0.001; - std::sort(pneigh.begin(), pneigh.end(), compare()); + pneigh_sort_by_load(std::greater()); print_loads_p(false, xbt_log_priority_debug); @@ -28,7 +20,7 @@ void loba_fairstrategy::load_balance() 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()); } } }