X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/af35c0c75c52b0cf5d0518656473503f67a79613..b238ee6ba620f3b271cc16cc25a6838f42bdf537:/process.h diff --git a/process.h b/process.h index 152f5ed..38a6c42 100644 --- a/process.h +++ b/process.h @@ -4,7 +4,8 @@ #define USE_UNORDERED_MAP 1 //#undef USE_UNORDERED_MAP -#include +#include +#include #ifdef USE_UNORDERED_MAP # include # define MAP_TEMPLATE std::tr1::unordered_map @@ -12,6 +13,7 @@ # include # define MAP_TEMPLATE std::map #endif +#include #include #include #include "communicator.h" @@ -40,6 +42,9 @@ protected: pneigh_type pneigh; // list of pointers to neighbors that // we are free to reorder + template + void pneigh_sort_by_load(const Compare& comp); + // Get and set current load, which may be real load, or expected // load if opt::bookkeeping is true. double get_load() const; @@ -132,19 +137,17 @@ void process::set_load(double load) real_load = load; } -struct pneigh_load_less { - bool operator()(const neighbor* a, const neighbor* b) - { - return a->get_load() < b->get_load(); - } -}; - -struct pneigh_load_greater { - bool operator()(const neighbor* a, const neighbor* b) - { - return a->get_load() > b->get_load(); - } -}; +template +void process::pneigh_sort_by_load(const Compare& comp) +{ + using std::tr1::bind; + using std::tr1::placeholders::_1; + using std::tr1::placeholders::_2; + std::sort(pneigh.begin(), pneigh.end(), + bind(comp, + bind(&neighbor::get_load, _1), + bind(&neighbor::get_load, _2))); +} #endif // !PROCESS_H