Changeset df32ee

Timestamp:

Oct 30, 2010, 6:44:28 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:

a8188d

Parents:

6e1e10

git-author:

Frederik Heber <heber@…> (10/26/10 09:06:37)

git-committer:

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

Message:

New class ActionTrait(s).

• ActionTrait is the template class that is specialized for every Action.
• ActionTraits is the interface that is inherited by every specialization.
• the interface Action contains AcionTraits itself.
• each specific Action has a specialized ActionTrait<> contained.

note

• so far, everything is short-wired through MapOfActions.
• later the specialization will have specific constructors and get info therein.

Location:

src/Actions

Files:

• Action.cpp (modified) (2 diffs)
• Action.hpp (modified) (3 diffs)
• ActionTraits.cpp (added)
• ActionTraits.hpp (added)
• Action_impl_header.hpp (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)

src/Actions/Action.cpp

@@ -20 +20 @@
 #include "Helpers/MemDebug.hpp"
 
+#include <iostream>
 #include <string>
 
@@ -104 +105 @@
   return true;
 }
+

src/Actions/Action.hpp

@@ -17 +17 @@
 class ActionSequence;
 class Dialog;
+
+#include "Actions/ActionTraits.hpp"
 
 /**
@@ -294 +296 @@
  */
 
+
 /**
  * Base class for all actions.
@@ -365 +368 @@
   virtual const std::string getName();
 
+  ActionTraits Traits;
+
 protected:
   /**

src/Actions/Action_impl_header.hpp

@@ -19 +19 @@
 #include <boost/preprocessor/seq/size.hpp>
 #include <boost/preprocessor/seq/transform.hpp>
+
+#include "Actions/ValueStorage.hpp"
 
 // some derived names
@@ -75 +77 @@
 #endif
 
+class ACTION;
+
+template <>
+class ActionTrait<ACTION> : public ActionTraits {
+public:
+  ActionTrait()
+  {}
+
+  ~ActionTrait() {}
+};
+
 class ACTION : public Action {
   friend
@@ -104 +117 @@
   } params;
 
+  ActionTrait<ACTION> Traits;
+
 protected:
   virtual Dialog * fillDialog(Dialog*);

src/Actions/Makefile.am

@@ -17 +17 @@
   ${TESSELATIONACTIONSOURCE} \
   ${WORLDACTIONSOURCE} \
+  ActionTraits.cpp \
   MapOfActions.cpp \
   ValueStorage.cpp
@@ -30 +31 @@
   ${TESSELATIONACTIONHEADER} \
   ${WORLDACTIONHEADER} \
+  ActionTraits.hpp \
   MapOfActions.hpp \
   ValueStorage.hpp \