Changeset 2a6a2c

Timestamp:

Oct 30, 2010, 6:44:29 PM (14 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:

24fbf3

Parents:

bc2990

git-author:

Frederik Heber <heber@…> (10/26/10 09:44:19)

git-committer:

Frederik Heber <heber@…> (10/30/10 18:44:29)

Message:

Removed MapOfActions::populateActions().

• Action prototypes are now instantiated within the object file, as they register automatically with the ActionRegistry and can henceforth be used.
  • new define INSTANCE with a sort of unique name.
  • instance is const and hence not to be used directly.
  • MapOfActions::populateActions() removed in CommandLineWindow, QtMainWindow and TextWindow classes.
  • NOTE: this hopefully remedies the problem of forgetting to add new Actions.
• Registry does not cleanup() in its destructor, but function may be called from derived class if desired.
  • All Action prototypes are destroyed at end of program and hence cleanup() would cause memory corruption.

Location:

src

Files:

• Actions/Action_impl_pre.hpp (modified) (3 diffs)
• Actions/MapOfActions.cpp (modified) (2 diffs)
• Actions/MapOfActions.hpp (modified) (1 diff)
• Patterns/Registry_impl.hpp (modified) (1 diff)
• UIElements/CommandLineUI/CommandLineWindow.cpp (modified) (1 diff)
• UIElements/Qt4/QtMainWindow.cpp (modified) (1 diff)
• UIElements/TextUI/TextWindow.cpp (modified) (1 diff)

src/Actions/Action_impl_pre.hpp

@@ -47 +47 @@
 #define STATE BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, State))
 #define PARAMS BOOST_PP_CAT(CATEGORY, BOOST_PP_CAT(ACTIONNAME, Parameters))
+#define INSTANCE BOOST_PP_CAT(this_, BOOST_PP_CAT(ACTIONNAME, _instance))
 
 // check if no lists given
@@ -158 +159 @@
 const char ACTION::NAME[] = TOKEN;
 
+// (const) prototype to be placed into the ActionRegistry (must be deleted by registry itself)
+const ACTION INSTANCE;
+
 // =========== constructor ===========
 ACTION::ACTION () :
@@ -223 +227 @@
 #undef PARAMS
 #undef STATE
+#undef INSTANCE
 
 #undef ACTIONNAME

src/Actions/MapOfActions.cpp

@@ -48 +48 @@
 
 #include "Actions/ActionRegistry.hpp"
-#include "Actions/AnalysisAction/MolecularVolumeAction.hpp"
-#include "Actions/AnalysisAction/PairCorrelationAction.hpp"
-#include "Actions/AnalysisAction/PointCorrelationAction.hpp"
-#include "Actions/AnalysisAction/PrincipalAxisSystemAction.hpp"
-#include "Actions/AnalysisAction/SurfaceCorrelationAction.hpp"
-#include "Actions/AtomAction/AddAction.hpp"
-#include "Actions/AtomAction/ChangeElementAction.hpp"
-#include "Actions/AtomAction/RemoveAction.hpp"
-#include "Actions/AtomAction/RotateAroundOriginByAngleAction.hpp"
-#include "Actions/AtomAction/TranslateAction.hpp"
-#include "Actions/CommandAction/BondLengthTableAction.hpp"
-#include "Actions/CommandAction/ElementDbAction.hpp"
-#include "Actions/CommandAction/FastParsingAction.hpp"
-#include "Actions/CommandAction/HelpAction.hpp"
-#include "Actions/CommandAction/VerboseAction.hpp"
-#include "Actions/CommandAction/VersionAction.hpp"
-#include "Actions/CommandAction/WarrantyAction.hpp"
-#include "Actions/FragmentationAction/ConstructBondGraphAction.hpp"
-#include "Actions/FragmentationAction/DepthFirstSearchAction.hpp"
-#include "Actions/FragmentationAction/SubgraphDissectionAction.hpp"
-#include "Actions/FragmentationAction/FragmentationAction.hpp"
-#include "Actions/MoleculeAction/BondFileAction.hpp"
-#include "Actions/MoleculeAction/ChangeNameAction.hpp"
-#include "Actions/MoleculeAction/CopyAction.hpp"
-#include "Actions/MoleculeAction/FillWithMoleculeAction.hpp"
-#include "Actions/MoleculeAction/FillVoidWithMoleculeAction.hpp"
-#include "Actions/MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp"
-#include "Actions/MoleculeAction/RotateAroundSelfByAngleAction.hpp"
-#include "Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.hpp"
-#include "Actions/MoleculeAction/SaveAdjacencyAction.hpp"
-#include "Actions/MoleculeAction/SaveBondsAction.hpp"
-#include "Actions/MoleculeAction/SaveTemperatureAction.hpp"
-#include "Actions/MoleculeAction/SuspendInWaterAction.hpp"
-#include "Actions/MoleculeAction/VerletIntegrationAction.hpp"
-#include "Actions/ParserAction/LoadXyzAction.hpp"
-#include "Actions/ParserAction/SaveXyzAction.hpp"
-#include "Actions/SelectionAction/AllAtomsAction.hpp"
-#include "Actions/SelectionAction/AllAtomsInsideCuboidAction.hpp"
-#include "Actions/SelectionAction/AllAtomsInsideSphereAction.hpp"
-#include "Actions/SelectionAction/AllAtomsOfMoleculeAction.hpp"
-#include "Actions/SelectionAction/AllMoleculesAction.hpp"
-#include "Actions/SelectionAction/AtomByElementAction.hpp"
-#include "Actions/SelectionAction/AtomByIdAction.hpp"
-#include "Actions/SelectionAction/ClearAllAtomsAction.hpp"
-#include "Actions/SelectionAction/ClearAllMoleculesAction.hpp"
-#include "Actions/SelectionAction/MoleculeByFormulaAction.hpp"
-#include "Actions/SelectionAction/MoleculeByIdAction.hpp"
-#include "Actions/SelectionAction/MoleculeOfAtomAction.hpp"
-#include "Actions/SelectionAction/NotAllAtomsAction.hpp"
-#include "Actions/SelectionAction/NotAllAtomsInsideCuboidAction.hpp"
-#include "Actions/SelectionAction/NotAllAtomsInsideSphereAction.hpp"
-#include "Actions/SelectionAction/NotAllAtomsOfMoleculeAction.hpp"
-#include "Actions/SelectionAction/NotAllMoleculesAction.hpp"
-#include "Actions/SelectionAction/NotAtomByElementAction.hpp"
-#include "Actions/SelectionAction/NotAtomByIdAction.hpp"
-#include "Actions/SelectionAction/NotMoleculeByFormulaAction.hpp"
-#include "Actions/SelectionAction/NotMoleculeByIdAction.hpp"
-#include "Actions/SelectionAction/NotMoleculeOfAtomAction.hpp"
-#include "Actions/TesselationAction/ConvexEnvelopeAction.hpp"
-#include "Actions/TesselationAction/NonConvexEnvelopeAction.hpp"
-#include "Actions/WorldAction/AddEmptyBoundaryAction.hpp"
-#include "Actions/WorldAction/BoundInBoxAction.hpp"
-#include "Actions/WorldAction/CenterInBoxAction.hpp"
-#include "Actions/WorldAction/CenterOnEdgeAction.hpp"
-#include "Actions/WorldAction/ChangeBoxAction.hpp"
-#include "Actions/WorldAction/InputAction.hpp"
-#include "Actions/WorldAction/OutputAction.hpp"
-#include "Actions/WorldAction/RepeatBoxAction.hpp"
-#include "Actions/WorldAction/ScaleBoxAction.hpp"
-#include "Actions/WorldAction/SetDefaultNameAction.hpp"
-#include "Actions/WorldAction/SetGaussianBasisAction.hpp"
-#include "Actions/WorldAction/SetOutputFormatsAction.hpp"
 #include "Actions/Values.hpp"
 
@@ -973 +901 @@
   } else
     throw IllegalTypeException(__FILE__,__LINE__);
-}
-
-
-
-void MapOfActions::populateActions()
-{
-  new AnalysisMolecularVolumeAction();
-  new AnalysisPairCorrelationAction();
-  new AnalysisPointCorrelationAction();
-  new AnalysisPrincipalAxisSystemAction();
-  new AnalysisSurfaceCorrelationAction();
-
-  new AtomAddAction();
-  new AtomChangeElementAction();
-  new AtomRemoveAction();
-  new AtomRotateAroundOriginByAngleAction();
-  new AtomTranslateAction();
-
-  new CommandBondLengthTableAction();
-  new CommandElementDbAction();
-  new CommandFastParsingAction();
-  new CommandHelpAction();
-  new CommandVerboseAction();
-  new CommandVersionAction();
-  new CommandWarrantyAction();
-
-  new FragmentationConstructBondGraphAction();
-  new FragmentationDepthFirstSearchAction();
-  new FragmentationFragmentationAction();
-  new FragmentationSubgraphDissectionAction();
-
-  new MoleculeBondFileAction();
-  new MoleculeChangeNameAction();
-  new MoleculeCopyAction();
-  new MoleculeFillWithMoleculeAction();
-  new MoleculeFillVoidWithMoleculeAction();
-  new MoleculeLinearInterpolationofTrajectoriesAction();
-  new MoleculeRotateAroundSelfByAngleAction();
-  new MoleculeRotateToPrincipalAxisSystemAction();
-  new MoleculeSaveAdjacencyAction();
-  new MoleculeSaveBondsAction();
-  new MoleculeSaveTemperatureAction();
-  new MoleculeSuspendInWaterAction();
-  new MoleculeVerletIntegrationAction();
-
-  new ParserLoadXyzAction();
-  new ParserSaveXyzAction();
-
-  new SelectionClearAllAtomsAction();
-  new SelectionClearAllMoleculesAction();
-  new SelectionAllAtomsAction();
-  new SelectionAllAtomsInsideCuboidAction();
-  new SelectionAllAtomsInsideSphereAction();
-  new SelectionAllAtomsOfMoleculeAction();
-  new SelectionAllMoleculesAction();
-  new SelectionAtomByElementAction();
-  new SelectionAtomByIdAction();
-  new SelectionMoleculeByIdAction();
-  new SelectionMoleculeByFormulaAction();
-  new SelectionMoleculeOfAtomAction();
-  new SelectionNotAllAtomsAction();
-  new SelectionNotAllAtomsInsideCuboidAction();
-  new SelectionNotAllAtomsInsideSphereAction();
-  new SelectionNotAllAtomsOfMoleculeAction();
-  new SelectionNotAllMoleculesAction();
-  new SelectionNotAtomByElementAction();
-  new SelectionNotAtomByIdAction();
-  new SelectionNotMoleculeByFormulaAction();
-  new SelectionNotMoleculeByIdAction();
-  new SelectionNotMoleculeOfAtomAction();
-
-  new TesselationConvexEnvelopeAction();
-  new TesselationNonConvexEnvelopeAction();
-
-  new WorldAddEmptyBoundaryAction();
-  new WorldBoundInBoxAction();
-  new WorldCenterInBoxAction();
-  new WorldCenterOnEdgeAction();
-  new WorldChangeBoxAction();
-  new WorldInputAction();
-  new WorldOutputAction();
-  new WorldRepeatBoxAction();
-  new WorldScaleBoxAction();
-  new WorldSetDefaultNameAction();
-  new WorldSetGaussianBasisAction();
-  new WorldSetOutputFormatsAction();
-}
+ }
 
 /** Adds all options to the CommandLineParser.

src/Actions/MapOfActions.hpp

@@ -164 +164 @@
   std::map <std::string, std::pair<std::string,std::string> > MenuDescription;
 
-  // instantiates and puts all known actions into the ActionRegistry
-  void populateActions();
-
   bool isCurrentValuePresent(const char *name) const;
   void queryCurrentValue(const char * name, class atom * &_T);

src/Patterns/Registry_impl.hpp

@@ -25 +25 @@
  */
 template <class T> Registry<T>::~Registry()
-{
-  cleanup();
-}
+{}
 
 /** Returns pointer to an instance named by \a name.

src/UIElements/CommandLineUI/CommandLineWindow.cpp

@@ -38 +38 @@
 CommandLineWindow::CommandLineWindow()
 {
-  // create and register all command line callable actions
-  MapOfActions::getInstance().populateActions();
-
   // Add status indicators etc...
   statusIndicator = new CommandLineStatusIndicator();

src/UIElements/Qt4/QtMainWindow.cpp

@@ -73 +73 @@
   }
 
-  // populate all actions
-  MapOfActions::getInstance().populateActions();
-
   // go through all actions and add them to its menu
   for (std::map <std::string, QtMenu *>::iterator MenuRunner = NametoTextMenuMap.begin(); MenuRunner != NametoTextMenuMap.end(); ++MenuRunner) {

src/UIElements/TextUI/TextWindow.cpp

@@ -60 +60 @@
   ShortcutList.insert('s');
   ShortcutList.insert('q');
-
-  // populate all actions
-  MapOfActions::getInstance().populateActions();
 
   // build the main menu