X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/014983949544db9a324cece29a0ccc46b1e3e1f3..92d7eb81980a40dda0715b23e874a1537cf3adb8:/options.cpp

diff --git a/options.cpp b/options.cpp
index f881ad3..54fd53d 100644
--- a/options.cpp
+++ b/options.cpp
@@ -26,7 +26,7 @@ namespace opt {
     // Automatic deployment
     namespace auto_depl {
         bool        enabled = false;
-        std::string topology;
+        std::string topology("clique");
         unsigned    nhosts = 0;
         double      load = 0.0;
     }
@@ -52,16 +52,16 @@ namespace opt {
     topologies_type topologies;
     topologies_type::topologies_type()
     {
+        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("clique", "all connected topology", deployment_clique);
-        NOL_INSERT("btree", "binary tree topologym intiial load at root", 
-                   deployment_btree);
         // NOL_INSERT("torus", "torus topology", deployment_torus);
-        NOL_INSERT("hcube", "hypercube topology", deployment_hcube);
     }
 
 } // namespace opt
@@ -138,7 +138,6 @@ int opt::parse_args(int* argc, char* argv[])
             break;
         }
     }
-    opt::auto_depl::enabled = !opt::auto_depl::topology.empty();
 
     if (opt::version_requested || opt::help_requested)
         return 1;
@@ -149,14 +148,10 @@ int opt::parse_args(int* argc, char* argv[])
         ERROR0("missing parameter -- <plaform_file>");
         result = 0;
     }
-    if (!opt::auto_depl::enabled) {
-        if (optind < *argc) {
-            opt::deployment_file = argv[optind++];
-        } else {
-            ERROR0("missing parameter -- <deployment_file>");
-            result = 0;
-        }
+    if (optind < *argc) {
+        opt::deployment_file = argv[optind++];
     }
+    opt::auto_depl::enabled = opt::deployment_file.empty();
 
     while (optind < *argc) {
         ERROR1("unused parameter -- \"%s\"", argv[optind++]);
@@ -205,9 +200,7 @@ void opt::usage()
 
 
     std::clog << "Usage: " << opt::program_name
-              << " [options] <platform_file> <deployment_file>\n";
-    std::clog << "       " << opt::program_name
-              << " [options] -T type <platform_file>\n";
+              << " [options] <platform_file> [<deployment_file>]\n";
 
     std::clog << "\nGlobal options\n";
     std::clog << o("-h")
@@ -225,7 +218,8 @@ void opt::usage()
 
     std::clog << "\nAutomatic deployment options\n";
     std::clog << o("-T name")
-              << "enable automatic deployment with selected topology\n";
+              << "enable automatic deployment with selected topology"
+              << " (" << opt::auto_depl::topology << ")\n";
     if (opt::help_requested > 1)
         so_list(opt::topologies);
     std::clog << o("-L value")