Interchange lb_iter and comp_iter, and improve process main loop.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index dc29495c236ee34f7ec47924fd966e5cc6c08fe5..aa953f9486d8fb87d3697281358a2c9108354224 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -54,8 +54,8 @@ namespace opt {
 
     // 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;
 
@@ -203,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;
@@ -292,10 +290,10 @@ 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 iterations", "%g", min_iter_duration);
-    DESCR("maximum number of comp. iterations", "%s",
-          h.val_or_string(comp_maxiter, "infinity"));
     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("`----");
@@ -371,11 +369,11 @@ void opt::usage()
 
     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";