remove duplication of configuration arguments

src/baseconfiguration.cpp

@@ -25,28 +25,24 @@ const std::string ConfigurationBase::k_extension_token = "%ext%";
 const std::string ConfigurationBase::k_outer_token = "%s%";
 const std::string ConfigurationBase::k_inner_token = "%i%";
 
-const config_map ConfigurationBase::default_config = {{"verbose", "false"},
+const config_map ConfigurationBase::arg_options = {
     {"registered", "registered.xdmf"}, {"map", "map.xdmf"}, {"lambda", "auto"}, {"mask", ""},
     {"registered_h5_path", "/registered"}, {"map_h5_path", "/map"}, {"lambda_mult", "1.0"},
-    {"with_memory", "true"}, {"save_intermediate_frames", "false"},
     {"intermediate_template", "%name%-intermediate-%s%-%i%%ext%"},
     {"intermediate_map_template", "%name%-intermediate-map-%s%-%i%%ext%"},
     {"intermediate_directory", "intermediates"}, {"max_iterations", "100"}};
 
+const config_map ConfigurationBase::bool_options = {
+  {"verbose", "false"}, {"with_memory", "true"}, {"save_intermediate_frames", "false"}};
+
 const std::vector<std::string> ConfigurationBase::required_options = {
     "fixed", "moved", "nodespacing"};
 
-const std::vector<std::string> ConfigurationBase::arg_options = {"fixed", "moved", "mask",
-    "nodespacing", "registered", "map", "lambda", "lambda_mult", "intermediate_template",
-    "intermediate_directory", "max_iterations", "registered_h5_path", "map_h5_path"};
-
-const std::vector<std::string> ConfigurationBase::bool_options = {
-    "verbose", "with_memory", "save_intermediate_frames"};
-
 ConfigurationBase::ConfigurationBase(const int &argc, char const *const *argv)
-  : config(default_config), arguments(argv + 1, argv + argc),
-    invocation_name(get_invocation_name(argv[0]))
+  : arguments(argv + 1, argv + argc), invocation_name(get_invocation_name(argv[0]))
 {
+  config.insert(arg_options.cbegin(), arg_options.cend());
+  config.insert(bool_options.cbegin(), bool_options.cend());
 }
 
 void ConfigurationBase::validate_config()
@@ -59,7 +55,7 @@ void ConfigurationBase::validate_config()
       missing.push_back(req_it);
     }
   }
-  if (missing.size() > 0)
+  if (missing.empty())
   {
     std::ostringstream errmsg;
     errmsg << "Missing required argument(s) \"";

src/baseconfiguration.hpp

@@ -80,10 +80,9 @@ class ConfigurationBase {
   std::vector<std::string> arguments;
   std::string invocation_name;
 
-  static const config_map default_config;
   static const std::vector<std::string> required_options;
-  static const std::vector<std::string> arg_options;
-  static const std::vector<std::string> bool_options;
+  static const config_map arg_options;
+  static const config_map bool_options;
 };
 
 #endif // CONFIGURATION_HPP

src/iniconfiguration.cpp

@@ -76,7 +76,7 @@ void IniConfig::parse_arguments()
     std::exit(0);
   }
 
-  if (vm.count("help") || !vm.count("config-file"))
+  if (vm.count("help") > 0 || vm.count("config-file") != 1 )
   {
     // TODO improve to iterate over options
     std::cout << usage() << std::endl << cmdline_visible << std::endl;
@@ -112,11 +112,11 @@ void IniConfig::read_config_file(const std::string &config_path)
   for (const auto &it : config_data)
   {
     std::string key = ba::to_lower_copy(it.first);
-    if (std::find(arg_options.cbegin(), arg_options.cend(), key) != arg_options.cend())
+    if (arg_options.find(key) != arg_options.cend())
     {
       config[key] = it.second.data();
     }
-    else if (std::find(bool_options.cbegin(), bool_options.cend(), key) != bool_options.cend())
+    else if (bool_options.find(key) != bool_options.cend())
     {
       config[key] = boost::to_lower_copy(it.second.data());
     }
@@ -126,7 +126,7 @@ void IniConfig::read_config_file(const std::string &config_path)
     }
   }
 
-  if (unknowns.size() > 0)
+  if (!unknowns.empty())
   {
     std::ostringstream unkss;
     std::copy(unknowns.begin(), unknowns.end(), std::ostream_iterator<std::string>(unkss, ", "));

src/shirtemulation.cpp

@@ -81,7 +81,7 @@ void ShirtConfig::parse_arguments()
     }
 
     // now check option taking arguments
-    if (std::find(arg_options.cbegin(), arg_options.cend(), arg_lower) != arg_options.cend())
+    if (arg_options.find(arg_lower) != arg_options.cend())
     {
       // try to get associated option
       if (args_it == arguments.cend())
@@ -95,8 +95,7 @@ void ShirtConfig::parse_arguments()
       // finally insert arg-val pair into the argument map
       config[arg_lower] = optval;
     }
-    else if (
-        std::find(bool_options.cbegin(), bool_options.cend(), arg_lower) != bool_options.cend())
+    else if (bool_options.find(arg_lower) != bool_options.cend())
     {
       // insert arg-val pair into argument map
       config[arg_lower] = "true";