new fair

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index f4dbb28659726ae404c15870f378c476ab079931..ccfd7005553b5c46e7d78a9588091579d5045023 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -5,11 +5,6 @@ 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) {
@@ -21,8 +16,7 @@ void loba_fairstrategy::load_balance()
 {
     std::sort(pneigh.begin(), pneigh.end(), compare());
 
-               // print_loads_p();
-    //print_loads_p(false, xbt_log_priority_debug);
+    print_loads_p(false, xbt_log_priority_debug);
 
     bool found = true;
 

diff --git a/loba_fairstrategy.h b/loba_fairstrategy.h
index 3e09627c4b5536067dda1d436c5252d7d347e0d0..e6de7a98149f04b55c4db924f4778ae7e1e18085 100644 (file)
--- a/loba_fairstrategy.h
+++ b/loba_fairstrategy.h
@@ -12,7 +12,7 @@ private:
     void load_balance();
 };
 
-#endif //!LOBA_SIMPLE
+#endif //!LOBA_FAIR_STRATEGY_H
 
 // Local variables:
 // mode: c++

diff --git a/loba_simple.h b/loba_simple.h
index 77cd8adba882657334e702e7bffd87c29d3d0efb..164641c684b3c208dd6561bcc152a08567776840 100644 (file)
--- a/loba_simple.h
+++ b/loba_simple.h
@@ -1,5 +1,5 @@
-#ifndef LOBA_SIMPLE
-#define LOBA_SIMPLE
+#ifndef LOBA_SIMPLE_H
+#define LOBA_SIMPLE_H
 
 #include "process.h"
 
@@ -12,7 +12,7 @@ private:
     void load_balance();
 };
 
-#endif //!LOBA_SIMPLE
+#endif //!LOBA_SIMPLE_H
 
 // Local variables:
 // mode: c++