Changeset 7912e9 for src/UIElements/CommandLineUI/CommandLineParser.cpp

Timestamp:

Feb 2, 2015, 7:20:43 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

55feff5

Parents:

27e464

git-author:

Frederik Heber <heber@…> (10/17/14 16:50:10)

git-committer:

Frederik Heber <heber@…> (02/02/15 19:20:43)

Message:

CommandLineParser adds Action's default values as implicit.

• this allows to have action's token as option with both empty (then default is used) and some given argument.

File:

• src/UIElements/CommandLineUI/CommandLineParser.cpp (modified) (11 diffs)

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