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

diff --combined options.cpp
index 78612a127b26b0c365ba13b540e60723e0fe2b1f,3602fbffdccd562df03a7ff8d89337382dadb62e..9b1344aade28af3378c0f5cd6e6d615b41589f8b
--- 1/options.cpp
--- 2/options.cpp
+++ b/options.cpp
@@@ -11,7 -11,6 +11,7 @@@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main)
  #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"
@@@ -80,8 -79,6 +80,8 @@@ namespace opt 
      {
          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",
@@@ -420,8 -417,9 +420,9 @@@ void opt::usage(
  
      std::clog << "Usage: " << opt::program_name
                << " [options] <platform_file> [<deployment_file>]\n";
+     std::clog << "Current values for the parameters are given between square brackets.\n";
  
-     std::clog << "\nGlobal options\n";
+     std::clog << "\nGlobal options:\n";
      std::clog << o("-h")
                << "print help and exit (use -hh or -hhh for extended help)\n";
      if (opt::help_requested < 1)
@@@ -430,14 -428,14 +431,14 @@@
      std::clog << o("--help") << "print help from SimGrid framework and exit\n";
      std::clog << o("-V") << "print version and exit\n";
  
-     std::clog << "\nSimulation parameters\n";
+     std::clog << "\nSimulator output:\n";
      std::clog << o("-l value")
                << "print current load every n lb iterations, 0 to disable"
                << " [" << opt::log_rate << "]\n";
      std::clog << o("-v")
                << "verbose: do not override the default logging parameters\n";
  
-     std::clog << "\nAutomatic deployment options\n";
+     std::clog << "\nAutomatic deployment:\n";
      std::clog << o("-T name")
                << "enable automatic deployment with selected topology"
                << " [" << opt::auto_depl::topology << "]\n";
@@@ -454,21 -452,32 +455,32 @@@
                << " [" << opt_helper::on_off(opt::auto_depl::random_distribution)
                << "]\n";
      std::clog << o("-r value")
-               << "random seed, 0 for using it on time()"
+               << "random seed, 0 for a seed based on current date"
                << " [" << opt::auto_depl::random_seed << "]\n";
  
-     std::clog << "\nLoad balancing algorithm\n";
+     std::clog << "\nLoad balancing algorithm:\n";
      std::clog << o("-a name") << "load balancing algorithm"
                << " [" << opt::loba_algo << "]\n";
      if (opt::help_requested > 1)
          so_list(opt::loba_algorithms);
      std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")"
                << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
+ 
+     std::clog << "\nLb. and comp. iterations:\n";
      std::clog << o("-s value")
                << "minimum duration between lb. iterations"
                << " [" << opt::min_lb_iter_duration << "]\n";
+     std::clog << o("-S 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. iter."
+               << " [" << opt::comp_iter_delay << "]\n";
+     std::clog << o("-D value")
+               << "start comp. iterations after given time"
+               << " [" << opt::comp_time_delay << "]\n";
  
-     std::clog << "\nApplication parameters\n";
+     std::clog << "\nComputations and communications:\n";
      std::clog << o("-c [aN,...]a0")
                << "polynomial factors for computation cost"
                << " [" << opt::comp_cost.to_string() << "]\n";
@@@ -481,17 -490,8 +493,8 @@@
      std::clog << o("-M value")
                << "maximum data transfer amount, 0 for no limit"
                << " [" << opt::max_transfer_amount << "]\n";
-     std::clog << o("-S value")
-               << "minimum duration between comp. iterations"
-               << " [" << opt::min_comp_iter_duration << "]\n";
-     std::clog << o("-d value")
-               << "start computations after given number of lb iterations"
-               << " [" << opt::comp_iter_delay << "]\n";
-     std::clog << o("-D value")
-               << "start computations after given time"
-               << " [" << opt::comp_time_delay << "]\n";
  
-     std::clog << "\nParameters for the end of the simulation\n";
+     std::clog << "\nEnd of the simulation:\n";
      std::clog << o("-i value")
                << "maximum number of lb. iterations, 0 for no limit"
                << " [" << opt::lb_maxiter << "]\n";
@@@ -507,7 -507,7 +510,7 @@@
      if (opt::help_requested < 3)
          return;
  
-     std::clog << "\nLogging support\n"
+     std::clog << "\nLogging support:\n"
                << "    See SimGrid documentation on:\n"
                << "        http://simgrid.gforge.inria.fr/doc/group__XBT__log.html#log_user\n"
                << "    Existing categories are:\n"