Changeset 1e6913 for src

Timestamp:

Jun 9, 2010, 2:09:46 PM (15 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:

58bbd3, 756b53

Parents:

94d131

Message:

Order of actions called did not conincide with order on command line.

CommandLineWindow::display()

• Actions were called by going through the repository and checking whether present on CommandLine, this causes different sequence of actions to be called.
• Now, we go through all command lind parameters and check whether they correspond to an action in the registry which we call.

ActionRegistry:

• new function: ActionRegistry::isActionByNamePresent() checks whether action is present in registry

• TESTFIX: MaxOrder now failws if not another action is called before (here now, -v 1). Otherwise, return code only occurs on third call not on second

Location:

src

Files:

• Actions/ActionRegistry.cpp (modified) (1 diff)
• Actions/ActionRegistry.hpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineWindow.cpp (modified) (2 diffs)

src/Actions/ActionRegistry.cpp

@@ -37 +37 @@
 }
 
+bool ActionRegistry::isActionByNamePresent(const std::string name){
+  map<const string,Action*>::iterator iter;
+  iter = actionMap.find(name);
+  return iter!=actionMap.end();
+}
+
 void ActionRegistry::registerAction(Action* action){
   pair<map<const string,Action*>::iterator,bool> ret;

src/Actions/ActionRegistry.hpp

@@ -21 +21 @@
 public:
   Action* getActionByName(const std::string);
+  bool isActionByNamePresent(const std::string name);
   void registerAction(Action*);
   void unregisterAction(Action*);

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -74 +74 @@
 CommandLineWindow::~CommandLineWindow()
 {
-//  // go through all possible actions
-//  for(std::map<const std::string,Action*>::iterator ActionRunner = ActionRegistry::getInstance().getBeginIter(); ActionRegistry::getInstance().getBeginIter() != ActionRegistry::getInstance().getEndIter(); ActionRunner = ActionRegistry::getInstance().getBeginIter()) {
-//    ActionRegistry::getInstance().unregisterAction(ActionRunner->second);
-//    delete(ActionRunner->second);
-//  }
-
   delete statusIndicator;
 }
@@ -85 +79 @@
 void CommandLineWindow::display() {
   // go through all possible actions
-  for(std::map<const std::string,Action*>::iterator ActionRunner = ActionRegistry::getInstance().getBeginIter(); ActionRunner != ActionRegistry::getInstance().getEndIter(); ActionRunner++) {
-    // check whether action is present in command line
-    if (CommandLineParser::getInstance().vm.count(ActionRunner->first)) {
-      ActionRunner->second->call();
-    }
+  for (po::variables_map::iterator CommandRunner = CommandLineParser::getInstance().vm.begin(); CommandRunner != CommandLineParser::getInstance().vm.end(); ++CommandRunner) {
+    cout << "Checking presence of " << CommandRunner->first << endl;
+    if (ActionRegistry::getInstance().isActionByNamePresent(CommandRunner->first))
+      ActionRegistry::getInstance().getActionByName(CommandRunner->first)->call();
   }
 }