Move declarations at proper place, and fix indentation.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index cf9bb0f7348793cfce4d70faa0bfa862b16a1ec5..189bed2f5957fd9d8dd1e73ff56ca535aa36018a 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -47,13 +47,14 @@ namespace opt {
     // Load balancing algorithm
     std::string loba_algo("simple");
     bool bookkeeping = false;
+    double min_lb_iter_duration = 1.0;          // fixme: find better defaults
 
     // Application parameters
-    // fixme: find better defaults
-    cost_func comp_cost("1e9, 0");
-    cost_func comm_cost("1e6, 0");
-    double min_lb_iter_duration = 1.0;
-    double min_comp_iter_duration = 1.0;
+    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;
@@ -65,10 +66,14 @@ namespace opt {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
-        NOL_INSERT("fairstrategy", "balance with fair strategy", loba_fairstrategy);
-        NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm", loba_makhoul);
-        NOL_INSERT("none", "no load-balancing (for testing only)", process);
-        NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
+        NOL_INSERT("fairstrategy", "balance with fair strategy",
+                   loba_fairstrategy);
+        NOL_INSERT("makhoul", "balance with Makhoul's PhD algorithm",
+                   loba_makhoul);
+        NOL_INSERT("none", "no load-balancing (for testing only)",
+                   process);
+        NOL_INSERT("simple", "balance with least loaded neighbor",
+                   loba_simple);
     }
 
     topologies_type topologies;
@@ -195,7 +200,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;
@@ -217,7 +223,8 @@ bool opt::parse_args(int* argc, char* argv[])
             try {
                 opt::comp_cost = cost_func(optarg);
             } catch (...) {
-                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"",
+                          c, optarg);
                 result = false;
             }
             break;
@@ -225,10 +232,17 @@ bool opt::parse_args(int* argc, char* argv[])
             try {
                 opt::comm_cost = cost_func(optarg);
             } catch (...) {
-                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"", c, optarg);
+                XBT_ERROR("invalid argument for option '-%c' -- \"%s\"",
+                          c, optarg);
                 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;
@@ -319,12 +333,14 @@ void opt::print()
     }
     DESCR("load balancing algorithm", "%s", loba_algo.c_str());
     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("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 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",
@@ -391,6 +407,9 @@ void opt::usage()
         so_list(opt::loba_algorithms);
     std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")"
               << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
+    std::clog << o("-s value")
+              << "minimum duration between lb. iterations"
+              << " [" << opt::min_lb_iter_duration << "]\n";
 
     std::clog << "\nApplication parameters\n";
     std::clog << o("-c [aN,...]a0")
@@ -399,12 +418,15 @@ void opt::usage()
     std::clog << o("-C [aN,...]a0")
               << "polynomial factors for communication cost"
               << " [" << opt::comm_cost.to_string() << "]\n";
-    std::clog << o("-s value")
-              << "minimum duration between lb. iterations"
-              << " [" << opt::min_lb_iter_duration << "]\n";
     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")