X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/ba8a9c5fbc92dc95fc99d8078b3474fd2fd5a043..86907b33d6c8f6f749d37a7bf9bcad5e6dcc0695:/options.cpp?ds=inline

diff --git a/options.cpp b/options.cpp
index 0a9fb5c..7a65a71 100644
--- a/options.cpp
+++ b/options.cpp
@@ -32,7 +32,7 @@ namespace opt {
     }
 
     // Load balancing algorithm
-    std::string loba_algo("none");
+    std::string loba_algo("simple");
     bool bookkeeping = false;
 
     // Application parameters
@@ -45,20 +45,24 @@ namespace opt {
     loba_algorithms_type loba_algorithms;
     loba_algorithms_type::loba_algorithms_type()
     {
-        THIS_INSERT("none", "no load-balancing", process);
-        THIS_INSERT("simple", "balance with least loaded neighbor",
-                    loba_simple);
+        NOL_INSERT("none", "no load-balancing (for testing)", process);
+        NOL_INSERT("simple", "balance with least loaded neighbor", loba_simple);
     }
 
-#if 0
     topologies_type topologies;
     topologies_type::topologies_type()
     {
-        THIS_INSERT("none", "no load-balancing", process);
-        THIS_INSERT("simple", "balance with least loaded neighbor",
-                    loba_simple);
+        NOL_INSERT("btree", "binary tree topologym intiial load at root", 
+                   deployment_btree);
+        NOL_INSERT("clique", "all connected topology", deployment_clique);
+        NOL_INSERT("hcube", "hypercube topology", deployment_hcube);
+        NOL_INSERT("line", "line topology, initial load at one end",
+                   deployment_line);
+        NOL_INSERT("ring", "ring topology", deployment_ring);
+        NOL_INSERT("star", "star topology, initial load at center",
+                   deployment_star);
+        // NOL_INSERT("torus", "torus topology", deployment_torus);
     }
-#endif
 
 } // namespace opt
 
@@ -84,6 +88,11 @@ int opt::parse_args(int* argc, char* argv[])
         switch (c) {
         case 'a':
             opt::loba_algo = optarg;
+            if (!opt::loba_algorithms.exists(opt::loba_algo)) {
+                ERROR1("unknownw load balancing algorithm -- %s",
+                       opt::loba_algo.c_str());
+                result = 0;
+            }
             break;
         case 'b':
             opt::bookkeeping = true;
@@ -113,7 +122,12 @@ int opt::parse_args(int* argc, char* argv[])
             std::istringstream(optarg) >> opt::auto_depl::nhosts;
             break;
         case 'T':
-            opt::auto_depl::topology = optarg;
+            opt::auto_depl::topology = optarg; 
+            if (!opt::topologies.exists(opt::auto_depl::topology)) {
+                ERROR1("unknownw topology -- %s",
+                       opt::auto_depl::topology.c_str());
+                result = 0;
+            }
             break;
         case 'V':
             opt::version_requested = true;
@@ -155,21 +169,22 @@ int opt::parse_args(int* argc, char* argv[])
 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");
-    INFO1("| platform file.......: \"%s\"", opt::platform_file.c_str());
+    INFO1("| log rate.....................: %u",     opt::log_rate);
+    INFO1("| platform file................: \"%s\"", opt::platform_file.c_str());
     if (opt::auto_depl::enabled) {
-        INFO0("| automatic deployment enabled with:");
-        INFO1("|     topology........: %s", opt::auto_depl::topology.c_str());
-        INFO1("|     number of hosts.: %u", opt::auto_depl::nhosts);
-        INFO1("|     initial load....: %g", opt::auto_depl::load);
+        INFO0("| automatic deployment enabled");
+        INFO1("| - topology...................: %s", opt::auto_depl::topology.c_str());
+        INFO1("| - number of hosts............: %u", opt::auto_depl::nhosts);
+        INFO1("| - initial load...............: %g", opt::auto_depl::load);
     } else {
-        INFO1("| deployment file.....: \"%s\"", opt::deployment_file.c_str());
+        INFO1("| deployment file..............: \"%s\"", opt::deployment_file.c_str());
     }
-    INFO1("| log rate............: %u",     opt::log_rate);
-    INFO1("| maxiter.............: %u",     opt::maxiter);
-    INFO1("| exit on close.......: %s",     on_off(opt::exit_on_close));
-    INFO1("| bookkeeping.........: %s",     on_off(opt::bookkeeping));
-    INFO1("| comp. cost factors..: [%s]",   opt::comp_cost.to_string().c_str());
-    INFO1("| comm. cost factors..: [%s]",   opt::comm_cost.to_string().c_str());
+    INFO1("| load balancing algorithm.....: %s",   opt::loba_algo.c_str());
+    INFO1("| bookkeeping..................: %s",   on_off(opt::bookkeeping));
+    INFO1("| computation cost factors.....: [%s]", opt::comp_cost.to_string().c_str());
+    INFO1("| communication cost factors...: [%s]", opt::comm_cost.to_string().c_str());
+    INFO1("| maximum number of iterations.: %u",   opt::maxiter);
+    INFO1("| exit on close................: %s",   on_off(opt::exit_on_close));
     INFO0("`----");
 }
 
@@ -212,11 +227,7 @@ void opt::usage()
     std::clog << o("-T name")
               << "enable automatic deployment with selected topology\n";
     if (opt::help_requested > 1)
-#if 0
         so_list(opt::topologies);
-#else
-        std::clog << so("name") << "FIXME\n"; // fixme
-#endif
     std::clog << o("-L value")
               << "total load with auto deployment, 0 for number of hosts"
               << " (" << opt::auto_depl::load << ")\n";