Add Makhoul's algorithm.

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index dc29495c236ee34f7ec47924fd966e5cc6c08fe5..96b53e0ae9c14a4e7bd30f073c3f53c13260e69d 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -11,6 +11,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 #include "process.h"
 #include "loba_simple.h"
 #include "loba_fairstrategy.h"
+#include "loba_makhoul.h"
 
 #include "options.h"
 
@@ -53,17 +54,17 @@ namespace opt {
     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 = 0;
+    unsigned comp_maxiter = 0;
     double time_limit = 0;
-    bool exit_on_close = false;
+    bool exit_on_close = true;
 
     // Named parameters lists
     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);
     }
@@ -188,10 +189,10 @@ bool opt::parse_args(int* argc, char* argv[])
                 && result;
             break;
         case 'b':
-            opt::bookkeeping = true;
+            opt::bookkeeping = !opt::bookkeeping;
             break;
         case 'e':
-            opt::exit_on_close = true;
+            opt::exit_on_close = !opt::exit_on_close;
             break;
         case 'h':
             opt::help_requested++;
@@ -203,12 +204,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 +291,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("`----");
@@ -333,53 +332,55 @@ void opt::usage()
 
     std::clog << "\nSimulation parameters\n";
     std::clog << o("-l value")
-              << "print current load every n-th iterations, 0 to disable"
-              << " (" << opt::log_rate << ")\n";
+              << "print current load every n lb iterations, 0 to disable"
+              << " [" << opt::log_rate << "]\n";
     std::clog << o("-v")
               << "verbose: do not override the default logging parameters\n";
 
     std::clog << "\nAutomatic deployment options\n";
     std::clog << o("-T name")
               << "enable automatic deployment with selected topology"
-              << " (" << opt::auto_depl::topology << ")\n";
+              << " [" << opt::auto_depl::topology << "]\n";
     if (opt::help_requested > 1)
         so_list(opt::topologies);
     std::clog << o("-L value")
               << "total load with auto deployment, 0 for number of hosts"
-              << " (" << opt::auto_depl::load << ")\n";
+              << " [" << opt::auto_depl::load << "]\n";
     std::clog << o("-N value")
-              << "number of hosts to use with auto deployment,"
-              << " 0 for max. (" << opt::auto_depl::nhosts << ")\n";
+              << "number of hosts to use with auto deployment, 0 for max."
+              << " [" << opt::auto_depl::nhosts << "]\n";
 
     std::clog << "\nLoad balancing algorithm\n";
     std::clog << o("-a name") << "load balancing algorithm"
-              << " (" << opt::loba_algo << ")\n";
+              << " [" << opt::loba_algo << "]\n";
     if (opt::help_requested > 1)
         so_list(opt::loba_algorithms);
-    std::clog << o("-b") << "enable bookkeeping (\"virtual load\")\n";
+    std::clog << o("-b") << "toggle bookkeeping (\"virtual load\")"
+              << " [" << opt_helper::on_off(opt::bookkeeping) << "]\n";
 
     std::clog << "\nApplication parameters\n";
     std::clog << o("-c [fn,...]f0")
               << "polynomial factors for computation cost"
-              << " (" << opt::comp_cost.to_string() << ")\n";
+              << " [" << opt::comp_cost.to_string() << "]\n";
     std::clog << o("-C [fn,...]f0")
               << "polynomial factors for communication cost"
-              << " (" << opt::comm_cost.to_string() << ")\n";
+              << " [" << opt::comm_cost.to_string() << "]\n";
     std::clog << o("-s value")
               << "minimum duration between iterations"
-              << " (" << opt::min_iter_duration << ")\n";
+              << " [" << 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";
+              << " [" << 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";
+              << " [" << opt::time_limit << "]\n";
+    std::clog << o("-e") << "toggle exit on reception of \"close\" message"
+              << " [" << opt_helper::on_off(opt::exit_on_close) << "]\n";
 
     if (opt::help_requested < 3)
         return;