Changeset ed3944 for src

Timestamp:

Sep 19, 2013, 8:23:52 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:

f92ef3

Parents:

d67e6c

git-author:

Frederik Heber <heber@…> (08/19/13 16:12:47)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:52)

Message:

ActionQueue contains now ptr to ActionRegistry to allow forward ref in header.

• SubgraphDissectionAction needs include ActionRegistry.
• ActionNameValidator requires ActionRegistry include.

Location:

src

Files:

• Actions/ActionQueue.cpp (modified) (2 diffs)
• Actions/ActionQueue.hpp (modified) (3 diffs)
• Actions/GraphAction/SubgraphDissectionAction.cpp (modified) (1 diff)
• Parameters/Validators/Specific/ActionNameValidator.cpp (modified) (1 diff)

src/Actions/ActionQueue.cpp

@@ -43 +43 @@
 #include <vector>
 
+#include "Actions/ActionRegistry.hpp"
+
 using namespace MoleCuilder;
 
-ActionQueue::ActionQueue()
+ActionQueue::ActionQueue() :
+    AR(new ActionRegistry())
 {}
 
 ActionQueue::~ActionQueue()
-{}
+{
+  delete AR;
+}
 
 Action* ActionQueue::getActionByName(const std::string &name)
 {
-  return AR.getActionByName(name);
+  return AR->getActionByName(name);
 }
 
 bool ActionQueue::isActionKnownByName(const std::string &name) const
 {
-  return AR.isActionPresentByName(name);
+  return AR->isActionPresentByName(name);
 }
 
 int ActionQueue::getLastPosition(const std::string &MenuName) const
 {
-  return AR.getLastPosition(MenuName);
+  return AR->getLastPosition(MenuName);
 }
 
@@ -79 +84 @@
   returnlist.insert(
       returnlist.end(),
-      MapKeyConstIterator<ActionRegistry::const_iterator>(AR.getBeginIter()),
-      MapKeyConstIterator<ActionRegistry::const_iterator>(AR.getEndIter()));
+      MapKeyConstIterator<ActionRegistry::const_iterator>(AR->getBeginIter()),
+      MapKeyConstIterator<ActionRegistry::const_iterator>(AR->getEndIter()));
 
   return returnlist;

src/Actions/ActionQueue.hpp

@@ -19 +19 @@
 #include <vector>
 
-#include "Actions/ActionRegistry.hpp"
 
 namespace MoleCuilder {
 
 class Action;
+class ActionRegistry;
+class ActionTrait;
 
 /** This class combines the whole handling of Actions into a single class.
@@ -77 +78 @@
    */
   ActionRegistry& getActionRegistry() {
-    return AR;
+    return *AR;
   }
 
@@ -94 +95 @@
 
   //!> ActionRegistry to spawn new actions
-  ActionRegistry AR;
+  ActionRegistry *AR;
 
   //!> internal queue of actions

src/Actions/GraphAction/SubgraphDissectionAction.cpp

@@ -43 +43 @@
 #include "Actions/GraphAction/SubgraphDissectionAction.hpp"
 #include "Actions/ActionQueue.hpp"
+#include "Actions/ActionRegistry.hpp"
 
 #include "Descriptors/AtomDescriptor.hpp"

src/Parameters/Validators/Specific/ActionNameValidator.cpp

@@ -39 +39 @@
 
 #include "Actions/ActionQueue.hpp"
+#include "Actions/ActionRegistry.hpp"
 
 bool ActionNameValidator::isValid(const std::string & _value) const