X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/51f707d60785283c582c16c141ab6832a744dd3a..2e3129cd655efb5ccfa93000546cefd02b725154:/options.cpp?ds=sidebyside

diff --git a/options.cpp b/options.cpp
index 89f8b18..96b53e0 100644
--- a/options.cpp
+++ b/options.cpp
@@ -11,6 +11,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "process.h"
 #include "loba_simple.h"
 #include "loba_fairstrategy.h"
+#include "loba_makhoul.h"
 
 #include "options.h"
 
@@ -53,17 +54,17 @@ namespace opt {
     double min_iter_duration = 1.0;
 
     // Parameters for the end of the simulation
-    // fixme: find better defaults
-    unsigned lb_maxiter = 10;
+    unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;
-    bool exit_on_close = false;
+    bool exit_on_close = true;
 
     // Named parameters lists
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
         NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
+        NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm", loba_makhoul);
         NOL_INSERT("none", "no load-balancing (for testing only)", process);
         NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }