Define process::pneigh_sort_by_load().

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index a9f8e6048fb379c0d74d5bfed060887a00101c44..5530f5a5be94a2a6d989fefa50a17d733b464bff 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -1,22 +1,14 @@
-#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()
 {
     const double delta = 0.001;
 
 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);
 


@@ -28,7 +20,7 @@ void loba_fairstrategy::load_balance()
             if (pneigh[i]->get_load() <= get_load() - 2 * delta) {
                 found = true;
                 send(pneigh[i], delta);
             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());

             }
         }
     }
             }
         }
     }