Changeset 10aee4 for src/Actions/ActionRegistry.cpp

Timestamp:

Aug 5, 2015, 7:12:24 AM (9 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:

c307ba

Parents:

94232b

git-author:

Frederik Heber <heber@…> (08/03/15 09:25:02)

git-committer:

Frederik Heber <heber@…> (08/05/15 07:12:24)

Message:

Cleaned up ActionQueue's interface: Actions are always cloned.

• Action's dstor needs to be public as we have a clone() function.
• ActionRegistrys' (and AQ's) getActionByName now returns const ref. We must not return a ptr as it may not get deleted elsewhere. We are handing out prototypes.
• queueAction(action*,...) is private to prevent leakage, queueAction(string, ...) is the public interface.
• some other small functions are now private, too.
• MakroActions now need to clone() the prototype on prepare() and delete them on unprepare().
• ActionSequence deletes contained actions.
• FIX: ActionSequenceUnitTest cannot check on not-called property of removed actions anymore as these are gone now (they are deleted on removal and they are cloned on insertion).
• DOCU: Updated documentation on Actions.

File:

• src/Actions/ActionRegistry.cpp (modified) (4 diffs)

src/Actions/ActionRegistry.cpp

@@ -62 +62 @@
   //std::cout << "ActionRegistry::ActionRegistry() called, instance is " << this << "." << std::endl;
   fillRegistry();
+  prepareAllMakroActions();
   fillOptionRegistry();
   completely_instatiated = true;
@@ -75 +76 @@
   // add all MakroActions: PLEASE adhere to the alphabetical ordering
   {
-    MakroAction * presentAction =
-        dynamic_cast<MakroAction *>(getActionByName("molecular-dynamics"));
-    ASSERT( presentAction != NULL,
-        "ActionRegistry::fillRegistry() - makro action has not been registered.");
-    presentAction->unprepare(*this);
-  }
-  {
-    MakroAction * presentAction =
-        dynamic_cast<MakroAction *>(getActionByName("optimize-structure"));
-    ASSERT( presentAction != NULL,
-        "ActionRegistry::fillRegistry() - makro action has not been registered.");
-    presentAction->unprepare(*this);
-  }
-  {
-    MakroAction * presentAction =
-        dynamic_cast<MakroAction *>(getActionByName("subgraph-dissection"));
-    ASSERT( presentAction != NULL,
-        "ActionRegistry::fillRegistry() - makro action has not been registered.");
-    presentAction->unprepare(*this);
-  }
-  {
-    MakroAction * presentAction =
-        dynamic_cast<MakroAction *>(getActionByName("translate-molecules"));
-    ASSERT( presentAction != NULL,
-        "ActionRegistry::fillRegistry() - makro action has not been registered.");
-    presentAction->unprepare(*this);
+    MakroAction & presentAction =
+        const_cast<MakroAction &>(
+        dynamic_cast<const MakroAction &>(getActionByName("molecular-dynamics")));
+    presentAction.unprepare(*this);
+  }
+  {
+    MakroAction & presentAction =
+        const_cast<MakroAction &>(
+        dynamic_cast<const MakroAction &>(getActionByName("optimize-structure")));
+    presentAction.unprepare(*this);
+  }
+  {
+    MakroAction & presentAction =
+        const_cast<MakroAction &>(
+        dynamic_cast<const MakroAction &>(getActionByName("subgraph-dissection")));
+    presentAction.unprepare(*this);
+  }
+  {
+    MakroAction & presentAction =
+        const_cast<MakroAction &>(
+        dynamic_cast<const MakroAction &>(getActionByName("translate-molecules")));
+    presentAction.unprepare(*this);
   }
 
@@ -124 +121 @@
 #include BOOST_PP_LOCAL_ITERATE()
 #undef instance_print  
-
+}
+
+void ActionRegistry::prepareAllMakroActions()
+{
   // now prepare each macro action that require presence of all primitive ones
   {
-    MakroAction * presentAction =
-        dynamic_cast<MakroAction *>(getActionByName("subgraph-dissection"));
-    ASSERT( presentAction != NULL,
-        "ActionRegistry::fillRegistry() - makro action has not been registered.");
-    presentAction->prepare(*this);
-  }
-  {
-    MakroAction * presentAction =
-        dynamic_cast<MakroAction *>(getActionByName("molecular-dynamics"));
-    ASSERT( presentAction != NULL,
-        "ActionRegistry::fillRegistry() - makro action has not been registered.");
-    presentAction->prepare(*this);
-  }
-  {
-    MakroAction * presentAction =
-        dynamic_cast<MakroAction *>(getActionByName("optimize-structure"));
-    ASSERT( presentAction != NULL,
-        "ActionRegistry::fillRegistry() - makro action has not been registered.");
-    presentAction->prepare(*this);
-  }
-  {
-    MakroAction * presentAction =
-        dynamic_cast<MakroAction *>(getActionByName("translate-molecules"));
-    ASSERT( presentAction != NULL,
-        "ActionRegistry::fillRegistry() - makro action has not been registered.");
-    presentAction->prepare(*this);
+    MakroAction & presentAction =
+        const_cast<MakroAction &>(
+        dynamic_cast<const MakroAction &>(getActionByName("subgraph-dissection")));
+    presentAction.prepare(*this);
+  }
+  {
+    MakroAction & presentAction =
+        const_cast<MakroAction &>(
+        dynamic_cast<const MakroAction &>(getActionByName("molecular-dynamics")));
+    presentAction.prepare(*this);
+  }
+  {
+    MakroAction & presentAction =
+        const_cast<MakroAction &>(
+        dynamic_cast<const MakroAction &>(getActionByName("optimize-structure")));
+    presentAction.prepare(*this);
+  }
+  {
+    MakroAction & presentAction =
+        const_cast<MakroAction &>(
+        dynamic_cast<const MakroAction &>(getActionByName("translate-molecules")));
+    presentAction.prepare(*this);
   }
 }
@@ -227 +223 @@
 /** Just passes on call to Registry<Action>::getByName().
  * \param name name of Action
- * \return pointer to Action
- */
-Action* ActionRegistry::getActionByName(const std::string &name)
-{
-  return getByName(name);
+ * \return const ref to Action
+ */
+const Action& ActionRegistry::getActionByName(const std::string &name)
+{
+  Action * const action = getByName(name);
+  ASSERT( action != NULL,
+      "ActionRegistry::getActionByName() - action "+name+" not present!");
+  return *action;
 }