Changeset dfef3f for src/Actions/Action.cpp

Timestamp:

Nov 7, 2011, 4:13:18 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:

2aa9ef

Parents:

d628da

git-author:

Frederik Heber <heber@…> (11/01/11 23:27:34)

git-committer:

Frederik Heber <heber@…> (11/07/11 16:13:18)

Message:

FIX: empty states Action::success and ::failure are now managed by ActionHistory.

• the python function reinit() runs into trouble because the static entities Action::success and ::failure are missing after a reinit() causing a std::exception to be thrown. Now we manage the static state instances via ActionHistory cstor and dstor. As ActionHistory::init() must be called before any action is called, this should always work well.
• added static function Action::createStaticStateEntities().

File:

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

src/Actions/Action.cpp

@@ -45 +45 @@
 }
 
-// An empty state to indicate success
-Action::state_ptr Action::success = getEmptyState();
-Action::state_ptr Action::failure = getEmptyState();
+void Action::removeStaticStateEntities()
+{
+  Action::success.reset();
+  Action::failure.reset();
+}
+
+void Action::createStaticStateEntities()
+{
+  Action::success = getEmptyState();
+  Action::failure = getEmptyState();
+}
+
+// An empty state to indicate success, these are (de)initialized by ActionHistory
+Action::state_ptr Action::success;
+Action::state_ptr Action::failure;
 
 Action::Action(const ActionTrait &_Traits, bool _doRegister) :
@@ -149 +161 @@
 }
 
-void Action::removeStaticStateEntities()
-{
-  success.reset();
-  failure.reset();
-}
-
 Dialog * Action::createDialog(){
   Dialog *dialog = UIFactory::getInstance().makeDialog();