Changeset 3139b2 for src/Actions/Action.cpp

Timestamp:

Nov 7, 2011, 12:24:02 PM (13 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:

6ca7b9

Parents:

c20b35

git-author:

Frederik Heber <heber@…> (09/26/11 13:38:55)

git-committer:

Frederik Heber <heber@…> (11/07/11 12:24:02)

Message:

Renamed ActionTrait and ActionTraits.

• the specialized Trait contains multiple OptionTraits, hence is now called ActionTrait_s_, where its base class (that just has the OptionTrait for itself) is called ActionTrait.
• This caused many changes in other Action related files.

File:

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

src/Actions/Action.cpp

@@ -49 +49 @@
 Action::state_ptr Action::failure = getEmptyState();
 
-Action::Action(const ActionTraits &_Traits, bool _doRegister) :
+Action::Action(const ActionTrait &_Traits, bool _doRegister) :
     Traits(_Traits)
 {
@@ -58 +58 @@
 
   // register with OptionRegistry
-  for (ActionTraits::options_const_iterator optioniter = Traits.getBeginIter();
+  for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();
       optioniter != Traits.getEndIter();
       ++optioniter) {
@@ -106 +106 @@
       ActionRegistry::getInstance().unregisterInstance(this);
 
-  for (ActionTraits::options_const_iterator optioniter = Traits.getBeginIter();
+  for (ActionTrait::options_const_iterator optioniter = Traits.getBeginIter();
       optioniter != Traits.getEndIter();
       ++optioniter) {
@@ -131 +131 @@
   }
   outputstream << "Options available for action '" << getName() << "':" << std::endl;
-  for (ActionTraits::options_const_iterator iter = Traits.getBeginIter();
+  for (ActionTrait::options_const_iterator iter = Traits.getBeginIter();
       iter != Traits.getEndIter();
       ++iter) {