Changeset 5a8f38 for src

Timestamp:

Sep 30, 2011, 8:19:37 AM (13 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:

79de12

Parents:

ec188c

git-author:

Frederik Heber <heber@…> (09/07/11 17:14:23)

git-committer:

Frederik Heber <heber@…> (09/30/11 08:19:37)

Message:

FIX: "position" and others were not accepted because they have been added multiple times.

• some newer version (1.46) of boost program options does not seem to like multiply added options although they are all the same (type, ...). This is fixed.

File:

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

src/UIElements/CommandLineUI/CommandLineParser.cpp

@@ -24 +24 @@
 #include <fstream>
 #include <iostream>
+#include <set>
 #include <map>
 
@@ -83 +84 @@
 void CommandLineParser::InitializeCommandArguments()
 {
+  // we need a list of already added options, otherwise we get ambigious exceptions
+  std::set<std::string> AlreadyAddedOptionNames;
+
   ActionRegistry &AR = ActionRegistry::getInstance();
   bool ActionAlreadyAdded_flag = false;
@@ -96 +100 @@
         ActionAlreadyAdded_flag = true;
       ASSERT( OptionRegistry::getInstance().isOptionPresentByName(optioniter->first),
-          "CommandLineParser::Init() - Option not present in OptionRegistry." );
+          "CommandLineParser::Init() - Option "+optioniter->first+" not present in OptionRegistry." );
       const OptionTrait* const currentOption = OptionRegistry::getInstance().getOptionByName(optioniter->first);
-      // add the option
-//      std::cout << "Registering Option "
-//          << currentOption->getName()
-//          << " with type '" << currentOption->getTypeName() << "' "
-//          << " with description '" << currentOption->getDescription() << "' ";
-//      if (currentOption->hasShortForm())
-//        std::cout << ", with short form " << currentOption->getShortForm();
-//      else
-//        std::cout << ", with no short form ";
-//      if (currentOption->hasDefaultValue())
-//        std::cout << ", with default value " << currentOption->getDefaultValue();
-//      else
-//        std::cout << ", with no default value ";
-//      std::cout << std::endl;
-
-      AddOptionToParser(currentOption, (CmdParserLookup["options"]));
+
+      if (AlreadyAddedOptionNames.find(optioniter->first) == AlreadyAddedOptionNames.end()) {
+        // add the option
+//        std::cout << "Registering Option "
+//            << currentOption->getName()
+//            << " with type '" << currentOption->getTypeName() << "' "
+//            << " with description '" << currentOption->getDescription() << "' ";
+//        if (currentOption->hasShortForm())
+//          std::cout << ", with short form " << currentOption->getShortForm();
+//        else
+//          std::cout << ", with no short form ";
+//        if (currentOption->hasDefaultValue())
+//          std::cout << ", with default value " << currentOption->getDefaultValue();
+//        else
+//          std::cout << ", with no default value ";
+//        std::cout << std::endl;
+
+        AddOptionToParser(currentOption, (CmdParserLookup["options"]));
+
+        AlreadyAddedOptionNames.insert(optioniter->first);
+      } else {
+//        std::cout << "Option " << currentOption->getName() << " already registered." << std::endl;
+      }
     }