Add option -G, to exit on detection of global convergence.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 80274639e362c7e78f450aa4612a452a24e30504..2db9aeba5b71285803460e83ff1e053903fa4ec7 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -76,9 +76,11 @@ namespace opt {
     double comp_time_delay = 0.0;               // fixme: find better defaults
 
     // Parameters for the end of the simulation
     double comp_time_delay = 0.0;               // fixme: find better defaults
 
     // Parameters for the end of the simulation

+    double avg_load_ratio = 0.0;

     unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;
     unsigned lb_maxiter = 0;
     unsigned comp_maxiter = 0;
     double time_limit = 0;

+    bool exit_on_convergence = false;

     bool exit_on_close = true;
 
     // Named parameters lists
     bool exit_on_close = true;
 
     // Named parameters lists


@@ -231,9 +233,13 @@ bool opt::parse_args(int* argc, char* argv[])
     int c;
     opterr = 0;
     while ((c = getopt(*argc, argv,
     int c;
     opterr = 0;
     while ((c = getopt(*argc, argv,

-                       "a:bc:C:d:D:eEhi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
+                       "%:"
+                       "a:bc:C:d:D:eEGhi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))

            != -1) {
         switch (c) {
            != -1) {
         switch (c) {

+        case '%':
+            PARSE_ARG(opt::avg_load_ratio);
+            break;

         case 'a':
             opt::loba_algo = optarg;
             result = opt_helper::nol_find_prefix(opt::loba_algorithms,
         case 'a':
             opt::loba_algo = optarg;
             result = opt_helper::nol_find_prefix(opt::loba_algorithms,


@@ -274,6 +280,9 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'E':
             opt::egocentric = !opt::egocentric;
             break;
         case 'E':
             opt::egocentric = !opt::egocentric;
             break;

+        case 'G':
+            opt::exit_on_convergence = !opt::exit_on_convergence;
+            break;

         case 'h':
             opt::help_requested++;
             break;
         case 'h':
             opt::help_requested++;
             break;


@@ -350,13 +359,6 @@ bool opt::parse_args(int* argc, char* argv[])
 
 #undef PARSE_ARG
 
 
 #undef PARSE_ARG
 

-    if (opt::option_x) {        // FIXME: remove this one day...
-        opt::loba_best_divisor = opt::option_x;
-        XBT_WARN("divisor for algorithms *best* set from option -x (%d => %u),"
-                 " use -k instead",
-                 opt::option_x, opt::loba_best_divisor);
-    }
-

     if (opt::version_requested || opt::help_requested)
         return 1;
 
     if (opt::version_requested || opt::help_requested)
         return 1;
 


@@ -443,7 +445,9 @@ void opt::print()
           h.val_or_string(lb_maxiter, "no limit"));
     DESCR("maximum number of comp. iterations", "%s",
           h.val_or_string(comp_maxiter, "no limit"));
           h.val_or_string(lb_maxiter, "no limit"));
     DESCR("maximum number of comp. iterations", "%s",
           h.val_or_string(comp_maxiter, "no limit"));

+    DESCR("convergence is assumed within (\%)", "%g", opt::avg_load_ratio);

     DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));
     DESCR("time limit", "%s", h.val_or_string(time_limit, "no limit"));

+    DESCR("exit on convergence", "%s", h.on_off(exit_on_convergence));

     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("`----");
 


@@ -562,6 +566,11 @@ void opt::usage()
     std::clog << o("-I value")
               << "maximum number of comp. iterations, 0 for no limit"
               << " [" << opt::comp_maxiter << "]\n";
     std::clog << o("-I value")
               << "maximum number of comp. iterations, 0 for no limit"
               << " [" << opt::comp_maxiter << "]\n";

+    std::clog << o("-% value")
+              << "percent of the load average to assume the convergence"
+              << " [" << opt::avg_load_ratio << "]\n";
+    std::clog << o("-G") << "toggle exit on detection of convergence"
+              << " [" << opt_helper::on_off(opt::exit_on_convergence) << "]\n";

     std::clog << o("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";
     std::clog << o("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";