Changeset 36053c for src/Actions

Timestamp:

Apr 29, 2014, 12:42:44 PM (11 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:

af5384

Parents:

ec43a2

git-author:

Frederik Heber <heber@…> (08/27/13 00:08:29)

git-committer:

Frederik Heber <heber@…> (04/29/14 12:42:44)

Message:

OptionRegistry is now filled by ActionRegistry() not by Action's cstors.

• otherwise we cannot instantiate new actions as they re-register options.

Location:

src/Actions

Files:

• Action.cpp (modified) (2 diffs)
• ActionRegistry.cpp (modified) (4 diffs)
• ActionRegistry.hpp (modified) (1 diff)

src/Actions/Action.cpp

@@ -43 +43 @@
 #include "Actions/ActionQueue.hpp"
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/OptionRegistry.hpp"
-#include "Actions/OptionTrait.hpp"
 #include "UIElements/Dialog.hpp"
 #include "CodePatterns/Assert.hpp"
@@ -77 +75 @@
 Action::Action(const ActionTrait &_Traits) :
     Traits(_Traits)
-{
-  // register with OptionRegistry
-  for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();
-      optioniter != Traits.getEndIter();
-      ++optioniter) {
-    // options may have been re-used by other Actions, so check beforehand whether adding is needed
-    if (!OptionRegistry::getInstance().isOptionPresentByName((optioniter->first))) {
-      OptionRegistry::getInstance().registerInstance(optioniter->second);
-    } else { // if present, ASSERT that types coincide
-#ifndef NDEBUG
-      OptionTrait const * const PresentOption = OptionRegistry::getInstance().getOptionByName(optioniter->first);
-#endif
-      ASSERT(PresentOption->getType() == optioniter->second->getType(),
-          ("Action::Action() - option to add "+
-              std::string(optioniter->first)+
-              " of Action "+
-              std::string(getName())+
-              " is already present with different type: "
-              +toString(PresentOption->getType())+" != "+toString(optioniter->second->getType())
-          )
-      );
-      ASSERT(PresentOption->getDefaultValue() == optioniter->second->getDefaultValue(),
-          ("Action::Action() - option to add "+
-              std::string(optioniter->first)+
-              " of Action "+
-              std::string(getName())+
-              " is already present with different default value: "
-              +PresentOption->getDefaultValue()+" != "+optioniter->second->getDefaultValue()
-          )
-      );
-      ASSERT(PresentOption->getShortForm() == optioniter->second->getShortForm(),
-          ("Action::Action() - option to add "+
-              std::string(optioniter->first)+
-              " of Action "+
-              std::string(getName())+
-              " is already present with different short form: "
-              +PresentOption->getShortForm()+" != "+optioniter->second->getShortForm()
-          )
-      );
-    }
-  }
-}
+{}
 
 Action::~Action()
-{
-  for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();
-      optioniter != Traits.getEndIter();
-      ++optioniter) {
-    // unregister option if still registered
-    if(OptionRegistry::getInstance().isOptionPresentByName((optioniter->first)))
-      if (OptionRegistry::getInstance().getOptionByName((optioniter->first)) == optioniter->second) {
-        OptionRegistry::getInstance().unregisterInstance(optioniter->second);
-    }
-  }
-}
+{}
 
 const string Action::getName() const

src/Actions/ActionRegistry.cpp

@@ -39 +39 @@
 
 #include "Actions/ActionRegistry.hpp"
+#include "Actions/OptionRegistry.hpp"
+#include "Actions/OptionTrait.hpp"
 #include "CodePatterns/Registry_impl.hpp"
 
@@ -60 +62 @@
   //std::cout << "ActionRegistry::ActionRegistry() called, instance is " << this << "." << std::endl;
   fillRegistry();
+  fillOptionRegistry();
   completely_instatiated = true;
 }
@@ -67 +70 @@
 ActionRegistry::~ActionRegistry()
 {
-  // first clear each macro action that require presence of all primitive ones
+  // first unregister all their options
+  clearOptionRegistry();
+
+  // second clear each macro action that require presence of all primitive ones
   {
     MakroAction * presentAction =
@@ -126 +132 @@
 }
 
+/** Registers every existing Action's option with the OptionRegistry.
+ *
+ */
+void ActionRegistry::fillOptionRegistry() const
+{
+  for (const_iterator iter = getBeginIter(); iter != getEndIter(); ++iter) {
+    // register with OptionRegistry
+    Action &currenAction = *(iter->second);
+    for (ActionTrait::options_const_iterator optioniter = currenAction.Traits.getBeginIter();
+        optioniter != currenAction.Traits.getEndIter();
+        ++optioniter) {
+      // options may have been re-used by other Actions, so check beforehand whether adding is needed
+      if (!OptionRegistry::getInstance().isOptionPresentByName((optioniter->first))) {
+        OptionRegistry::getInstance().registerInstance(optioniter->second);
+      } else { // if present, ASSERT that types coincide
+#ifndef NDEBUG
+        OptionTrait const * const PresentOption = OptionRegistry::getInstance().getOptionByName(optioniter->first);
+#endif
+        ASSERT(PresentOption->getType() == optioniter->second->getType(),
+            ("Action::Action() - option to add "+
+                std::string(optioniter->first)+
+                " of Action "+
+                std::string(currenAction.getName())+
+                " is already present with different type: "
+                +toString(PresentOption->getType())+" != "+toString(optioniter->second->getType())
+            )
+        );
+        ASSERT(PresentOption->getDefaultValue() == optioniter->second->getDefaultValue(),
+            ("Action::Action() - option to add "+
+                std::string(optioniter->first)+
+                " of Action "+
+                std::string(currenAction.getName())+
+                " is already present with different default value: "
+                +PresentOption->getDefaultValue()+" != "+optioniter->second->getDefaultValue()
+            )
+        );
+        ASSERT(PresentOption->getShortForm() == optioniter->second->getShortForm(),
+            ("Action::Action() - option to add "+
+                std::string(optioniter->first)+
+                " of Action "+
+                std::string(currenAction.getName())+
+                " is already present with different short form: "
+                +PresentOption->getShortForm()+" != "+optioniter->second->getShortForm()
+            )
+        );
+      }
+    }
+  }
+}
+
+/** Unregisters every existing Action's option from OptionRegistry.
+ *
+ */
+void ActionRegistry::clearOptionRegistry() const
+{
+  for (const_iterator iter = getBeginIter(); iter != getEndIter(); ++iter) {
+    Action &currenAction = *(iter->second);
+    for (ActionTrait::options_const_iterator optioniter = currenAction.Traits.getBeginIter();
+        optioniter != currenAction.Traits.getEndIter();
+        ++optioniter) {
+      // unregister option if still registered
+      if(OptionRegistry::getInstance().isOptionPresentByName((optioniter->first)))
+        if (OptionRegistry::getInstance().getOptionByName((optioniter->first)) == optioniter->second) {
+          OptionRegistry::getInstance().unregisterInstance(optioniter->second);
+      }
+    }
+  }
+}
+
 /** Just passes on call to Registry<Action>::getByName().
  * \param name name of Action

src/Actions/ActionRegistry.hpp

@@ -57 +57 @@
 private:
   void fillRegistry();
+  void fillOptionRegistry() const;
+  void clearOptionRegistry() const;
 
   //!> this tells whether ActionRegistry has been completed instantiated.