Changeset c17aa8 for src/Actions

Timestamp:

Feb 10, 2015, 2:09:38 PM (10 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:

ca09be

Parents:

0763ce

git-author:

Frederik Heber <heber@…> (01/25/15 15:50:27)

git-committer:

Frederik Heber <heber@…> (02/10/15 14:09:38)

Message:

FIX: ActionSequence now checks whether an Action in the sequence fails.

• otherwise if we are to repeat the sequence for 200 steps and one of the Actions fails on the first step, we still go through all of the remaining steps.

Location:

src/Actions

Files:

• ActionSequence.cpp (modified) (2 diffs)
• unittests/ActionSequenceUnitTest.cpp (modified) (1 diff)

src/Actions/ActionSequence.cpp

@@ -37 +37 @@
 #include "Actions/ActionSequence.hpp"
 #include "Actions/Action.hpp"
+#include "Actions/ActionExceptions.hpp"
 #include "UIElements/Dialog.hpp"
 
@@ -119 +120 @@
       // we bypass the normal call
       ActionState::ptr state = (*it)->performCall();
+      if (state == Action::failure)
+        throw ActionFailureException() << ActionNameString((*it)->getName());
       states.push_back(state);
     }

src/Actions/unittests/ActionSequenceUnitTest.cpp

@@ -313 +313 @@
   act.call();
 
-  CPPUNIT_ASSERT_EQUAL(true,wasCalled1->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(true,wasCalled2->wasCalled());
+  CPPUNIT_ASSERT_EQUAL(true,
+      static_cast<wasCalledActionStub *>(act.actions.actions.front())->wasCalled());
+  CPPUNIT_ASSERT_EQUAL(true,
+      static_cast<wasCalledActionStub *>(act.actions.actions.back())->wasCalled());
 
   ActionQueue::getInstance().undoLast();
 
-  CPPUNIT_ASSERT_EQUAL(false,wasCalled1->wasCalled());
-  CPPUNIT_ASSERT_EQUAL(false,wasCalled2->wasCalled());
+  CPPUNIT_ASSERT_EQUAL(false,
+      static_cast<wasCalledActionStub *>(act.actions.actions.front())->wasCalled());
+  CPPUNIT_ASSERT_EQUAL(false,
+      static_cast<wasCalledActionStub *>(act.actions.actions.back())->wasCalled());
 
   delete sequence;