mise a jour des résultats des expés

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index 7e02a21361c646ea6aabc18e084d7233cc2ab219..4054729142b10a0a835072cd700edf2a99a073cb 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -1,38 +1,23 @@
-#include <algorithm>
 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 #include "loba_fairstrategy.h"
 
-/* simple version:
- *   load balance with a least-loaded neighbor,
- *   without breaking the ping-pong condition
- */
-
-class compare {
-public:
-    bool operator()(const neighbor*a, const neighbor*b) {
-        return a->get_load() > b->get_load();
-    }
-};
-
 void loba_fairstrategy::load_balance()
 {
-    std::sort(pneigh.begin(), pneigh.end(), compare());
-
-               // print_loads_p();
-    //print_loads_p(false, xbt_log_priority_debug);
+    pneigh_sort_by_load(std::greater<double>());
+    print_loads_p(false, xbt_log_priority_debug);
 
+    const double delta = 0.001;
     bool found = true;
-
     while (found) {
         found = false;
         for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
-            if (pneigh[i]->get_load() <= get_load() - 2) {
+            if (pneigh[i]->get_load() <= get_load() - 2 * delta) {
                 found = true;
-                send(pneigh[i], 1);
-                DEBUG1("sent to %s", pneigh[i]->get_name());
+                send(pneigh[i], delta);
+                XBT_DEBUG("sent to %s", pneigh[i]->get_name());
             }
         }
     }