Update description of fairstrategy algorithm.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index 9ea0a72927ed0c6d8cac6315c7bf92d53e107569..0d269d65feb49d583fa53661537bf8607d7b1d48 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -16,6 +16,8 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
 #include "options.h"
 
+#define DATA_DESCR_WIDTH 42
+
 namespace opt {
 
     // Constants
@@ -48,6 +50,8 @@ namespace opt {
     std::string loba_algo("simple");
     bool bookkeeping = false;
     double min_lb_iter_duration = 1.0;          // fixme: find better defaults
+    double min_transfer_amount = 0.0;
+    double max_transfer_amount = 0.0;
 
     // Application parameters
     cost_func comp_cost("1e9, 0");              // fixme: find better defaults
@@ -66,10 +70,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;
@@ -129,10 +137,9 @@ const char* opt_helper::on_off(bool b)
 
 const char* opt_helper::descr(const char* str)
 {
-    const int descr_width = 40;
     std::string& res = descr_str;
     res = str;
-    res.resize(descr_width, '.');
+    res.resize(DATA_DESCR_WIDTH, '.');
     return res.c_str();
 }
 
@@ -197,7 +204,7 @@ bool opt::parse_args(int* argc, char* argv[])
     int c;
     opterr = 0;
     while ((c = getopt(*argc, argv,
-                       "a:bc:C:d:D:ehi:I:l:L:N:s:S:t:T:vV")) != -1) {
+                       "a:bc:C:d:D:ehi:I:l:L:m:M:N:s:S:t:T:vV")) != -1) {
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
@@ -219,7 +226,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;
@@ -227,7 +235,8 @@ 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;
@@ -249,6 +258,12 @@ bool opt::parse_args(int* argc, char* argv[])
         case 'L':
             PARSE_ARG(opt::auto_depl::load);
             break;
+        case 'm':
+            PARSE_ARG(opt::min_transfer_amount);
+            break;
+        case 'M':
+            PARSE_ARG(opt::max_transfer_amount);
+            break;
         case 'N':
             PARSE_ARG(opt::auto_depl::nhosts);
             break;
@@ -302,6 +317,12 @@ bool opt::parse_args(int* argc, char* argv[])
         result = false;
     }
 
+    if (opt::max_transfer_amount &&
+        opt::max_transfer_amount < opt::min_transfer_amount) {
+        XBT_ERROR("max. data transfer amount < min. data transfer amount");
+        result = false;
+    }
+
     return result;
 }
 
@@ -327,17 +348,22 @@ void opt::print()
     }
     DESCR("load balancing algorithm", "%s", loba_algo.c_str());
     DESCR("bookkeeping", "%s", h.on_off(bookkeeping));
-    DESCR("minimum duration between lb. iterations", "%g", min_lb_iter_duration);
+    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("minimum data transfer amount", "%g", min_transfer_amount);
+    DESCR("maximum data transfer amount", "%s",
+          h.val_or_string(max_transfer_amount, "no limit"));
+    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"));
+          h.val_or_string(lb_maxiter, "no limit"));
     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"));
+          h.val_or_string(comp_maxiter, "no limit"));
+    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("`----");
 
@@ -410,6 +436,12 @@ void opt::usage()
     std::clog << o("-C [aN,...]a0")
               << "polynomial factors for communication cost"
               << " [" << opt::comm_cost.to_string() << "]\n";
+    std::clog << o("-m value")
+              << "minimum data transfer amount"
+              << " [" << opt::min_transfer_amount << "]\n";
+    std::clog << o("-M value")
+              << "maximum data transfer amount, 0 for no limit"
+              << " [" << opt::max_transfer_amount << "]\n";
     std::clog << o("-S value")
               << "minimum duration between comp. iterations"
               << " [" << opt::min_comp_iter_duration << "]\n";
@@ -422,13 +454,13 @@ void opt::usage()
 
     std::clog << "\nParameters for the end of the simulation\n";
     std::clog << o("-i value")
-              << "maximum number of lb. iterations, 0 for infinity"
+              << "maximum number of lb. iterations, 0 for no limit"
               << " [" << opt::lb_maxiter << "]\n";
     std::clog << o("-I value")
-              << "maximum number of comp. iterations, 0 for infinity"
+              << "maximum number of comp. iterations, 0 for no limit"
               << " [" << opt::comp_maxiter << "]\n";
     std::clog << o("-t value")
-              << "time limit (simulated time), 0 for infinity"
+              << "time limit (simulated time), 0 for no limit"
               << " [" << opt::time_limit << "]\n";
     std::clog << o("-e") << "toggle exit on reception of \"close\" message"
               << " [" << opt_helper::on_off(opt::exit_on_close) << "]\n";