One more bug :(

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index b440f7ce76be2f908dc47fdc2a99d5a007819851..01ae4470bc092cfe0e37b95efa35697690f46655 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -66,6 +66,7 @@ namespace opt {
     double min_transfer_amount = 0.0;
     double max_transfer_amount = 0.0;
     bool integer_transfer = false;
+    unsigned loba_best_divisor = 1;
 
     // Application parameters
     cost_func comp_cost("1e9, 0");              // fixme: find better defaults
@@ -75,6 +76,7 @@ namespace opt {
     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;
@@ -230,9 +232,13 @@ bool opt::parse_args(int* argc, char* argv[])
     int c;
     opterr = 0;
     while ((c = getopt(*argc, argv,
-                       "a:bc:C:d:D:eEhi:I:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
+                       "%:"
+                       "a:bc:C:d:D:eEhi:I:k:l:L:m:M:N:r:Rs:S:t:T:vVx:X:Z"))
            != -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,
@@ -279,6 +285,9 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'i':
             PARSE_ARG(opt::lb_maxiter);
             break;
+        case 'k':
+            PARSE_ARG(opt::loba_best_divisor);
+            break;
         case 'I':
             PARSE_ARG(opt::comp_maxiter);
             break;
@@ -346,6 +355,13 @@ bool opt::parse_args(int* argc, char* argv[])
 
 #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;
 
@@ -373,6 +389,12 @@ bool opt::parse_args(int* argc, char* argv[])
         result = false;
     }
 
+    if (opt::loba_best_divisor <= 0) {
+        XBT_ERROR("divisor for algorithms *best* (%u) should be positive",
+                  opt::loba_best_divisor);
+        result = false;
+    }
+
     if (!opt::auto_depl::random_seed)
         opt::auto_depl::random_seed = time(NULL);
 
@@ -408,8 +430,6 @@ void opt::print()
     DESCR("load balancing algorithm", "%s", loba_algo.c_str());
     DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
     DESCR("egocentric mode", "%s", h.on_off(egocentric));
-    DESCR("minimum duration between lb. iterations", "%g",
-          min_lb_iter_duration);
     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);
@@ -417,6 +437,9 @@ void opt::print()
           h.val_or_string(max_transfer_amount, "no limit"));
     DESCR("only transfer integer data shares", "%s",
           h.on_off(integer_transfer));
+    DESCR("divisor for algorithms *best*", "%u", loba_best_divisor);
+    DESCR("minimum duration between lb. iterations", "%g",
+          min_lb_iter_duration);
     DESCR("minimum duration between comp. iterations", "%g",
           min_comp_iter_duration);
     DESCR("computations start after lb. iter", "%u", comp_iter_delay);
@@ -425,6 +448,7 @@ 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"));
+    DESCR("convergence is assumed within (\%)", "%g", opt::avg_load_ratio);
     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("`----");
@@ -503,6 +527,8 @@ void opt::usage()
     if (opt::help_requested > 1)
         std::clog << o("")
                   << "(a not so good idea introduced by git commit f5336c5)\n";
+    std::clog << o("-k value") << "divisor for algorithms *best*"
+              << " [" << opt::loba_best_divisor << "]\n";
 
     std::clog << "\nLb. and comp. iterations:\n";
     std::clog << o("-s value")
@@ -542,6 +568,9 @@ void opt::usage()
     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("-t value")
               << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";