Interchange lb_iter and comp_iter, and improve process main loop.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 6a6a8872f5dbb4a646d9518603d55ea01741f629..aa953f9486d8fb87d3697281358a2c9108354224 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -50,11 +50,13 @@ namespace opt {
     // fixme: find better defaults
     cost_func comp_cost("1e9, 0");
     cost_func comm_cost("1, 0");
+    double min_iter_duration = 1.0;
 
     // Parameters for the end of the simulation
     // fixme: find better defaults
-    unsigned comp_maxiter = 10;
-    unsigned lb_maxiter = comp_maxiter;
+    unsigned lb_maxiter = 10;
+    unsigned comp_maxiter = 0;
+    double time_limit = 0;
     bool exit_on_close = false;
 
     // Named parameters lists
@@ -111,7 +113,7 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
-    const int descr_width = 35;
+    const int descr_width = 40;
     std::string& res = descr_str;
     res = str;
     res.resize(descr_width, '.');
@@ -176,7 +178,7 @@ 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:T:vV")) != -1) {
+    while ((c = getopt(*argc, argv, "a:bc:C:ehi:I:l:L:N:s:t:T:vV")) != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
@@ -201,12 +203,10 @@ bool opt::parse_args(int* argc, char* argv[])
             opt::comm_cost = cost_func(optarg);
             break;
         case 'i':
-            std::istringstream(optarg) >> opt::comp_maxiter;
+            std::istringstream(optarg) >> opt::lb_maxiter;
             break;
         case 'I':
-            std::istringstream(optarg) >> opt::lb_maxiter;
-            ERROR0("option -I not implemented yet");
-            result = false;
+            std::istringstream(optarg) >> opt::comp_maxiter;
             break;
         case 'l':
             std::istringstream(optarg) >> opt::log_rate;
@@ -217,6 +217,12 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'N':
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
+        case 's':
+            std::istringstream(optarg) >> opt::min_iter_duration;
+            break;
+        case 't':
+            std::istringstream(optarg) >> opt::time_limit;
+            break;
         case 'T':
             opt::auto_depl::topology = optarg;
             result = opt_helper::nol_find_prefix(opt::topologies, "topology",
@@ -283,10 +289,12 @@ void opt::print()
     DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
     DESCR("computation cost factors", "[%s]", comp_cost.to_string().c_str());
     DESCR("communication cost factors", "[%s]", comm_cost.to_string().c_str());
-    DESCR("maximum number of comp. iterations", "%s",
-          h.val_or_string(comp_maxiter, "infinity"));
+    DESCR("minimum duration between iterations", "%g", min_iter_duration);
     DESCR("maximum number of lb. iterations", "%s",
           h.val_or_string(lb_maxiter, "infinity"));
+    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"));
     DESCR("exit on close", "%s", h.on_off(exit_on_close));
     INFO0("`----");
 
@@ -355,14 +363,20 @@ void opt::usage()
     std::clog << o("-C [fn,...]f0")
               << "polynomial factors for communication cost"
               << " (" << opt::comm_cost.to_string() << ")\n";
+    std::clog << o("-s value")
+              << "minimum duration between iterations"
+              << " (" << opt::min_iter_duration << ")\n";
 
     std::clog << "\nParameters for the end of the simulation\n";
     std::clog << o("-i value")
-              << "maximum number of comp. iterations, 0 for infinity"
-              << " (" << opt::comp_maxiter << ")\n";
-    std::clog << o("-I value")
               << "maximum number of lb. iterations, 0 for infinity"
               << " (" << opt::lb_maxiter << ")\n";
+    std::clog << o("-I value")
+              << "maximum number of comp. iterations, 0 for infinity"
+              << " (" << opt::comp_maxiter << ")\n";
+    std::clog << o("-t value")
+              << "time limit (simulated time), 0 for infinity"
+              << " (" << opt::time_limit << ")\n";
     std::clog << o("-e") << "exit on reception of \"close\" message\n";
 
     if (opt::help_requested < 3)