Changeset eea0bb

Timestamp:

Jan 29, 2015, 7:38:23 AM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

7e6c0d

Parents:

27e464 (diff), 7305d5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'GUI_smallchanges' into Candidate_v1.4.10

Files:

• src/Actions/CommandAction/HelpAction.def (modified) (1 diff)
• src/UIElements/CommandLineUI/CommandLineParser.cpp (modified) (11 diffs)
• src/UIElements/CommandLineUI/CommandLineParser.hpp (modified) (1 diff)
• tests/Python/AllActions/options.dat (modified) (2 diffs)
• tests/regression/Options/Help/testsuite-options-help.at (modified) (1 diff)
• tests/regression/Potential/FitPotential/testsuite-potential-fit-potential.at (modified) (6 diffs)

src/Actions/CommandAction/HelpAction.def ¶

@@ -18 +18 @@
 // "undefine" if no parameters are required, use (NOPARAM_DEFAULT) for each (undefined) default value
 #define paramtypes (std::string)
-#define paramtokens ("actionname")
+#define paramtokens ("help")
 #define paramdescriptions ("Name of an action whose option list is then given")
 #define paramdefaults (PARAM_DEFAULT(std::string("none")))

src/UIElements/CommandLineUI/CommandLineParser.cpp ¶

@@ -147 +147 @@
 //        std::cout << std::endl;
 
-        AddOptionToParser(currentOption, (CmdParserLookup["options"]));
+        AddOptionToParser(currentOption, (CmdParserLookup["options"]),
+            (optioniter->first == *iter) ?
+                true : false);
 
         AlreadyAddedOptionNames.insert(optioniter->first);
@@ -174 +176 @@
       ASSERT(CmdParserLookup.find(CurrentTrait.getMenuName()) != CmdParserLookup.end(),
           "CommandLineParser: boost::program_options::options_description for this Action not present.");
-      AddOptionToParser(dynamic_cast<const OptionTrait * const>(&CurrentTrait),(CmdParserLookup[CurrentTrait.getMenuName()]));
+      AddOptionToParser(
+          dynamic_cast<const OptionTrait * const>(&CurrentTrait),
+          (CmdParserLookup[CurrentTrait.getMenuName()]),
+          false);
     }
   }
@@ -191 +196 @@
  * \param *currentOption pointer to Action/Option to add
  * \param *OptionList program_options list to add to
- */
-void CommandLineParser::AddOptionToParser(const OptionTrait * const currentOption, po::options_description* OptionList)
+ * \param _DefaultAsImplicit whether to add a default value as default_value or
+ *        as implicit_value (default = option token present or not, implicit =
+          option token present but not necessarily followed by argument)
+ */
+void CommandLineParser::AddOptionToParser(
+    const OptionTrait * const currentOption, 
+    po::options_description* OptionList,
+    const bool _DefaultAsImplicit)
 {
   // check whether dynamic_cast in Init() suceeded
@@ -212 +223 @@
         (currentOption->getKeyAndShortForm().c_str(),
             currentOption->hasDefaultValue() ?
-                  po::value < bool >()->default_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str())) :
+                  (_DefaultAsImplicit ? 
+                      po::value < bool >()->implicit_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str())) :
+                      po::value < bool >()->default_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str()))) :
                   po::value < bool >(),
                   currentOption->getDescription().c_str())
@@ -239 +252 @@
         (currentOption->getKeyAndShortForm().c_str(),
             currentOption->hasDefaultValue() ?
-                  po::value < int >()->default_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str())) :
+                  (_DefaultAsImplicit ? 
+                      po::value < int >()->implicit_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str())) :
+                      po::value < int >()->default_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str()))) :
                   po::value < int >(),
                   currentOption->getDescription().c_str())
@@ -257 +272 @@
         (currentOption->getKeyAndShortForm().c_str(),
             currentOption->hasDefaultValue() ?
-                  po::value < unsigned int >()->default_value(boost::lexical_cast<unsigned int>(currentOption->getDefaultValue().c_str())) :
+                  (_DefaultAsImplicit ? 
+                      po::value < unsigned int >()->implicit_value(boost::lexical_cast<unsigned int>(currentOption->getDefaultValue().c_str())) :
+                      po::value < unsigned int >()->default_value(boost::lexical_cast<unsigned int>(currentOption->getDefaultValue().c_str()))) :
                   po::value < unsigned int >(),
                   currentOption->getDescription().c_str())
@@ -275 +292 @@
         (currentOption->getKeyAndShortForm().c_str(),
             currentOption->hasDefaultValue() ?
-                  po::value < double >()->default_value(boost::lexical_cast<double>(currentOption->getDefaultValue().c_str())) :
+                  (_DefaultAsImplicit ? 
+                      po::value < double >()->implicit_value(boost::lexical_cast<double>(currentOption->getDefaultValue().c_str())) :
+                      po::value < double >()->default_value(boost::lexical_cast<double>(currentOption->getDefaultValue().c_str()))) :
                   po::value < double >(),
                   currentOption->getDescription().c_str())
@@ -293 +312 @@
         (currentOption->getKeyAndShortForm().c_str(),
             currentOption->hasDefaultValue() ?
-                  po::value < std::string >()->default_value(currentOption->getDefaultValue()) :
+                  (_DefaultAsImplicit ? 
+                      po::value < std::string >()->implicit_value(currentOption->getDefaultValue()) :
+                      po::value < std::string >()->default_value(currentOption->getDefaultValue())) :
                   po::value < std::string >(),
                   currentOption->getDescription().c_str())
@@ -347 +368 @@
         (currentOption->getKeyAndShortForm().c_str(),
             currentOption->hasDefaultValue() ?
-                  po::value < int >()->default_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str())) :
+                  (_DefaultAsImplicit ? 
+                      po::value < int >()->implicit_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str())) :
+                      po::value < int >()->default_value(boost::lexical_cast<int>(currentOption->getDefaultValue().c_str()))) :
                   po::value < int >(),
                   currentOption->getDescription().c_str())
@@ -383 +406 @@
         (currentOption->getKeyAndShortForm().c_str(),
             currentOption->hasDefaultValue() ?
-                  po::value < std::string >()->default_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str())) :
+                  (_DefaultAsImplicit ? 
+                      po::value < std::string >()->implicit_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str())) :
+                      po::value < std::string >()->default_value(boost::lexical_cast< std::string >(currentOption->getDefaultValue().c_str()))) :
                   po::value < std::string >(),
                   currentOption->getDescription().c_str())
@@ -438 +463 @@
     po::store(po::command_line_parser(argc,argv).options(cmdline_options).run(), vm);
   } catch (std::exception &e) {
-    std::cerr << "Something went wrong with parsing the command-line arguments." << std::endl;
+    std::cerr << "Something went wrong with parsing the command-line arguments: " 
+        << e.what() << std::endl;
     World::getInstance().setExitFlag(134);
 #ifdef HAVE_ACTION_THREAD

src/UIElements/CommandLineUI/CommandLineParser.hpp ¶

@@ -90 +90 @@
 
   // adds options to the parser
-  void AddOptionToParser(const MoleCuilder::OptionTrait * const currentOption, po::options_description* OptionList);
+  void AddOptionToParser(
+      const MoleCuilder::OptionTrait * const currentOption, 
+      po::options_description* OptionList,
+      const bool _DefaultAsImplicit);
 
   // creates a map from short forms to action tokens needed to parse command line

tests/Python/AllActions/options.dat ¶

@@ -1 +1 @@
 #key    value
-actionname      "help"
 add-atom        "1"
 add-empty-boundary      "5,5,5"
@@ -88 +87 @@
 fragment-resultfile     "results.dat"
 grid-level      "5"
+help    "help"
 id-mapping      "1"
 input   "test.data"

tests/regression/Options/Help/testsuite-options-help.at ¶

@@ -27 +27 @@
 AT_CHECK([fgrep "list of all available Actions" stdout], 0, [ignore], [ignore])
 AT_CHECK([fgrep "Usage help" stdout], 0, [ignore], [ignore])
-AT_CHECK([../../molecuilder --help --actionname "help"], 0, [stdout], [ignore])
+AT_CHECK([../../molecuilder --help "help"], 0, [stdout], [ignore])
 AT_CHECK([fgrep "Options available for action 'help'" stdout], 0, [ignore], [ignore])
 

tests/regression/Potential/FitPotential/testsuite-potential-fit-potential.at ¶

@@ -21 +21 @@
 AT_SETUP([Potential - Fit morse potential to water])
 AT_KEYWORDS([potential parse-homologies fit-potential morse])
-AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
+AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
 
 file=length_homology.dat
@@ -47 +47 @@
 AT_SETUP([Potential - Fit harmonic potential to water])
 AT_KEYWORDS([potential parse-homologies fit-potential harmonic])
-AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
+AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
 
 file=harmonic_homology.dat
@@ -73 +73 @@
 AT_SETUP([Potential - Fit harmonic_angle potential to water])
 AT_KEYWORDS([potential parse-homologies fit-potential harmonic_angle])
-AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
+AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
 
 file=angle_homology.dat
@@ -99 +99 @@
 AT_SETUP([Potential - Fit torsion potential to butane])
 AT_KEYWORDS([potential parse-homologies fit-potential torsion])
-AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
+AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
 
 file=torsion_homology.dat
@@ -125 +125 @@
 AT_SETUP([Potential - Fit improper potential to ammonia])
 AT_KEYWORDS([potential parse-homologies fit-potential improper])
-AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
+AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
 
 file=improper_homology.dat
@@ -152 +152 @@
 AT_SETUP([Potential - Fit LJ potential to argon])
 AT_KEYWORDS([potential parse-homologies fit-potential lennardjones])
-AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
+AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
 
 file=lj_homology.dat