Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 23783fa5717e277983e199906196d23a0b266e7c..9b1344aade28af3378c0f5cd6e6d615b41589f8b 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -11,6 +11,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "deployment.h"
 #include "process.h"
 #include "loba_besteffort.h"
 #include "deployment.h"
 #include "process.h"
 #include "loba_besteffort.h"

+#include "loba_bulk.h"

 #include "loba_fairstrategy.h"
 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"
 #include "loba_fairstrategy.h"
 #include "loba_makhoul.h"
 #include "loba_makhoul2.h"


@@ -79,6 +80,8 @@ namespace opt {
     {
         NOL_INSERT("besteffort", "balance with best effort strategy",
                    loba_besteffort);
     {
         NOL_INSERT("besteffort", "balance with best effort strategy",
                    loba_besteffort);

+        NOL_INSERT("bulk", "describe your algorithm here...",
+                   loba_bulk);

         NOL_INSERT("fairstrategy", "balance with fair strategy",
                    loba_fairstrategy);
         NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",
         NOL_INSERT("fairstrategy", "balance with fair strategy",
                    loba_fairstrategy);
         NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",


@@ -471,7 +474,7 @@ void opt::usage()
               << "minimum duration between comp. iterations"
               << " [" << opt::min_comp_iter_duration << "]\n";
     std::clog << o("-d value")
               << "minimum duration between comp. iterations"
               << " [" << opt::min_comp_iter_duration << "]\n";
     std::clog << o("-d value")

-              << "start comp. iterations after given number of lb. iterations"
+              << "start comp. iterations after given number of lb. iter."

               << " [" << opt::comp_iter_delay << "]\n";
     std::clog << o("-D value")
               << "start comp. iterations after given time"
               << " [" << opt::comp_iter_delay << "]\n";
     std::clog << o("-D value")
               << "start comp. iterations after given time"