Wip++...

[loba.git] / options.cpp

diff --git a/options.cpp b/options.cpp
index aa3bedea4fe075bd018e69e0cfb8e3f6005a79b5..4dd53150f784f3f5f680d19b46e7082c80bb8a32 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -17,29 +17,39 @@ namespace opt {
     int help_requested = 0;
     bool version_requested = false;
 
     int help_requested = 0;
     bool version_requested = false;
 

-    cost_func comp_cost("1, 0");
-    cost_func comm_cost("1, 0");
+    bool bookkeeping = false;
+
+    cost_func comp_cost("1e9, 0"); // fixme: find better defaults

 
 } // namespace opt
 
 
 } // namespace opt
 

+namespace {
+
+    const char* on_off(bool b)
+    {
+        return b ? "on" : "off";
+    }
+
+}
+

 int opt::parse_args(int* argc, char* argv[])
 {
 int opt::parse_args(int* argc, char* argv[])
 {

-    char *tmp = strrchr(argv[0], '/');
+    char* tmp = strrchr(argv[0], '/');

     opt::program_name = (tmp ? tmp + 1 : argv[0]);
 
     int c;
     opterr = 0;
     opt::program_name = (tmp ? tmp + 1 : argv[0]);
 
     int c;
     opterr = 0;

-    while ((c = getopt(*argc, argv, "hc:C:V")) != -1) {
+    while ((c = getopt(*argc, argv, "bc:hV")) != -1) {

         switch (c) {
         switch (c) {

+        case 'b':
+            opt::bookkeeping = true;
+            break;

         case 'h':
             opt::help_requested++;
             break;
         case 'c':
             opt::comp_cost = cost_func(optarg);
             break;
         case 'h':
             opt::help_requested++;
             break;
         case 'c':
             opt::comp_cost = cost_func(optarg);
             break;

-        case 'C':
-            opt::comm_cost = cost_func(optarg);
-            break;

         case 'V':
             opt::version_requested = true;
             break;
         case 'V':
             opt::version_requested = true;
             break;


@@ -68,14 +78,14 @@ int opt::parse_args(int* argc, char* argv[])
 
     return 1;
 }
 
     return 1;
 }

-    
+

 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");
     INFO1("| platform_file.......: \"%s\"", opt::platform_file);
     INFO1("| application_file....: \"%s\"", opt::application_file);
 void opt::print()
 {
     INFO0(",----[ Simulation parameters ]");
     INFO1("| platform_file.......: \"%s\"", opt::platform_file);
     INFO1("| application_file....: \"%s\"", opt::application_file);

-    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("| bookkeeping.........: %s",     on_off(opt::bookkeeping));
+    INFO1("| comp. cost factors..: [%s]",   opt::comp_cost.to_string().c_str());

     INFO0("`----");
 }
 
     INFO0("`----");
 }
 


@@ -97,12 +107,10 @@ void opt::usage()
     if (opt::help_requested < 1)
         return;
     std::clog << o("-V") << "print version and exit\n";
     if (opt::help_requested < 1)
         return;
     std::clog << o("-V") << "print version and exit\n";

+    std::clog << o("-b") << "activate bookkeeping\n";

     std::clog << oo("-c", "[fn,...]f0")
               << "polynomial factors for computation cost ("
               << opt::comp_cost.to_string() << ")\n";
     std::clog << oo("-c", "[fn,...]f0")
               << "polynomial factors for computation cost ("
               << opt::comp_cost.to_string() << ")\n";

-    std::clog << oo("-C", "[fn,...]f0")
-              << "polynomial factors for communication cost ("
-              << opt::comm_cost.to_string() << ")\n";

 
 #undef o
 #undef oo
 
 #undef o
 #undef oo