X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/9793054ae3d7e158930379655cdc881879934441..9f21b5351f943feb1099f387d385c95bdacf6e62:/options.cpp?ds=inline

diff --git a/options.cpp b/options.cpp
index 107b180..9ea0a72 100644
--- a/options.cpp
+++ b/options.cpp
@@ -53,6 +53,8 @@ namespace opt {
     cost_func comp_cost("1e9, 0");              // fixme: find better defaults
     cost_func comm_cost("1e6, 0");              // fixme: find better defaults
     double min_comp_iter_duration = 1.0;        // fixme: find better defaults
+    unsigned comp_iter_delay = 0;               // fixme: find better defaults
+    double comp_time_delay = 0.0;               // fixme: find better defaults
 
     // Parameters for the end of the simulation
     unsigned lb_maxiter = 0;
@@ -194,7 +196,8 @@ bool opt::parse_args(int* argc, char* argv[])
     
     int c;
     opterr = 0;
-    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:S:t:T:vV")) != -1) {
+    while ((c = getopt(*argc, argv,
+                       "a:bc:C:d:D:ehi:I:l:L:N:s:S:t:T:vV")) != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
@@ -228,6 +231,12 @@ bool opt::parse_args(int* argc, char* argv[])
                 result = false;
             }
             break;
+        case 'd':
+            PARSE_ARG(opt::comp_iter_delay);
+            break;
+        case 'D':
+            PARSE_ARG(opt::comp_time_delay);
+            break;
         case 'i':
             PARSE_ARG(opt::lb_maxiter);
             break;
@@ -322,6 +331,8 @@ 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 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"));
     DESCR("maximum number of comp. iterations", "%s",
@@ -402,6 +413,12 @@ void opt::usage()
     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 << o("-i value")