Change "infinity" to "no limit" in help message.

Also print "no limit" when max_transfer_amount is null.

diff --git a/options.cpp b/options.cpp
index 9f7ea5c0a6b3a8cdc512c6623d99495d4c8c880f..e9aa9b078b1b640677ebc3b9c9fb4e14ad217851 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -352,16 +352,17 @@ void opt::print()
     DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
     DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
     DESCR("minimum data transfer amount", "%g", min_transfer_amount);
     DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
     DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
     DESCR("minimum data transfer amount", "%g", min_transfer_amount);

-    DESCR("maximum data transfer amount", "%g", max_transfer_amount);
+    DESCR("maximum data transfer amount", "%s",
+          h.val_or_string(max_transfer_amount, "no limit"));

     DESCR("minimum duration between comp. iterations", "%g",
           min_comp_iter_duration);
     DESCR("computations start after lb. iter", "%u", comp_iter_delay);
     DESCR("computations start after time", "%g", comp_time_delay);
     DESCR("maximum number of lb. iterations", "%s",
     DESCR("minimum duration between comp. iterations", "%g",
           min_comp_iter_duration);
     DESCR("computations start after lb. iter", "%u", comp_iter_delay);
     DESCR("computations start after time", "%g", comp_time_delay);
     DESCR("maximum number of lb. iterations", "%s",

-          h.val_or_string(lb_maxiter, "infinity"));
+          h.val_or_string(lb_maxiter, "no limit"));

     DESCR("maximum number of comp. iterations", "%s",
     DESCR("maximum number of comp. iterations", "%s",

-          h.val_or_string(comp_maxiter, "infinity"));
-    DESCR("time limit", "%s", h.val_or_string(time_limit, "infinity"));
+          h.val_or_string(comp_maxiter, "no limit"));
+    DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));

     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     XBT_INFO("`----");
 
     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     XBT_INFO("`----");
 


@@ -438,7 +439,7 @@ void opt::usage()
               << "minimum data transfer amount"
               << " [" << opt::min_transfer_amount << "]\n";
     std::clog << o("-M value")
               << "minimum data transfer amount"
               << " [" << opt::min_transfer_amount << "]\n";
     std::clog << o("-M value")

-              << "maximum data transfer amount (0 for no limit)"
+              << "maximum data transfer amount, 0 for no limit"

               << " [" << opt::max_transfer_amount << "]\n";
     std::clog << o("-S value")
               << "minimum duration between comp. iterations"
               << " [" << opt::max_transfer_amount << "]\n";
     std::clog << o("-S value")
               << "minimum duration between comp. iterations"


@@ -452,13 +453,13 @@ void opt::usage()
 
     std::clog << "\nParameters for the end of the simulation\n";
     std::clog << o("-i value")
 
     std::clog << "\nParameters for the end of the simulation\n";
     std::clog << o("-i value")

-              << "maximum number of lb. iterations, 0 for infinity"
+              << "maximum number of lb. iterations, 0 for no limit"

               << " [" << opt::lb_maxiter << "]\n";
     std::clog << o("-I value")
               << " [" << opt::lb_maxiter << "]\n";
     std::clog << o("-I value")

-              << "maximum number of comp. iterations, 0 for infinity"
+              << "maximum number of comp. iterations, 0 for no limit"

               << " [" << opt::comp_maxiter << "]\n";
     std::clog << o("-t value")
               << " [" << opt::comp_maxiter << "]\n";
     std::clog << o("-t value")

-              << "time limit (simulated time), 0 for infinity"
+              << "time limit (simulated time), 0 for no limit"

               << " [" << opt::time_limit << "]\n";
     std::clog << o("-e") << "toggle exit on reception of \"close\" message"
               << " [" << opt_helper::on_off(opt::exit_on_close) << "]\n";
               << " [" << opt::time_limit << "]\n";
     std::clog << o("-e") << "toggle exit on reception of \"close\" message"
               << " [" << opt_helper::on_off(opt::exit_on_close) << "]\n";