Improve help message.

diff --git a/options.cpp b/options.cpp
index 68809699c25c4d4436c51bee617e9e32ee5accdb..243ad59be73126b016e7b2ced37aaa3d1287e515 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -154,7 +154,10 @@ void opt::usage()
 
     std::clog << "Usage: " << opt::program_name
               << " [options] <platform_file> <deployment_file>\n";
 
     std::clog << "Usage: " << opt::program_name
               << " [options] <platform_file> <deployment_file>\n";

+    std::clog << "       " << opt::program_name
+              << " [options] -T type <platform_file>\n";

 
 

+    std::clog << "\nGlobal options\n";

     std::clog << o("-h")
               << "print help and exit (use -hh for extended help)\n";
     if (opt::help_requested < 1)
     std::clog << o("-h")
               << "print help and exit (use -hh for extended help)\n";
     if (opt::help_requested < 1)


@@ -163,7 +166,12 @@ void opt::usage()
     std::clog << o("--help") << "print help from SimGrid framework and exit\n";
     std::clog << o("-V") << "print version and exit\n";
 
     std::clog << o("--help") << "print help from SimGrid framework and exit\n";
     std::clog << o("-V") << "print version and exit\n";
 

-    std::clog << o("-b") << "activate bookkeeping\n";
+    std::clog << "\nSimulation parameters\n";
+    std::clog << o("-l value")
+              << "print current load every n-th iterations, 0 to disable"
+              << " (" << opt::log_rate << ")\n";
+
+    std::clog << "\nApplication parameters\n";

     std::clog << o("-c [fn,...]f0")
               << "polynomial factors for computation cost"
               << " (" << opt::comp_cost.to_string() << ")\n";
     std::clog << o("-c [fn,...]f0")
               << "polynomial factors for computation cost"
               << " (" << opt::comp_cost.to_string() << ")\n";


@@ -174,24 +182,26 @@ void opt::usage()
     std::clog << o("-i value")
               << "maximum number of iterations, 0 for infinity"
               << " (" << opt::maxiter << ")\n";
     std::clog << o("-i value")
               << "maximum number of iterations, 0 for infinity"
               << " (" << opt::maxiter << ")\n";

-    std::clog << o("-l value")
-              << "print current load every n-th iterations, 0 to disable"
-              << " (" << opt::log_rate << ")\n";
-    std::clog << o("-L value")
-              << "total load with auto deployment, 0 for number of hosts"
-              << " (" << opt::auto_depl::load << ")\n";
-    std::clog << o("-N value")
-              << "number of hosts to use with auto deployment,"
-              << " 0 for max. (" << opt::auto_depl::nhosts << ")\n";
+
+    std::clog << "\nLoad balancing algorithm\n";
+    std::clog << o("-b") << "enable bookkeeping\n";
+
+    std::clog << "\nAutomatic deployment options\n";

     std::clog << o("-T type")
               << "enable automatic deployment with selected topology\n";
     if (opt::help_requested > 1) {
         std::clog << so(1) << "pipo\n";
         std::clog << so(42) << "atchoum\n";
     }
     std::clog << o("-T type")
               << "enable automatic deployment with selected topology\n";
     if (opt::help_requested > 1) {
         std::clog << so(1) << "pipo\n";
         std::clog << so(42) << "atchoum\n";
     }

+    std::clog << o("-L value")
+              << "total load with auto deployment, 0 for number of hosts"
+              << " (" << opt::auto_depl::load << ")\n";
+    std::clog << o("-N value")
+              << "number of hosts to use with auto deployment,"
+              << " 0 for max. (" << opt::auto_depl::nhosts << ")\n";

 
 

+#undef so

 #undef o
 #undef o

-#undef oo

 }
 
 // Local variables:
 }
 
 // Local variables: