Changeset e69c87 for src/Actions/MoleculeAction

Timestamp:

Sep 21, 2011, 8:04:30 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:

520f93

Parents:

caeeb8

git-author:

Frederik Heber <heber@…> (04/27/11 12:06:33)

git-committer:

Frederik Heber <heber@…> (09/21/11 20:04:30)

Message:

Splitted off Undo and Redo parts into own tests (3-step rule).

• this way tests are cleaner as there are no old files left.
• added lots of Undos/Redos.

Corrected all failing regression tests (of these new Undos/Redos):

• new ActionExceptions, specifically ActionFailureException.
• Action::call() throws ActionFailureException when returned state_ptr equals failure.
• ActionHistory::undoLast(), ::redoLast() also throw when returning state_ptr equals failure.
• doUI() checks for thrownActionFailureException and sets World's ExitFlag to 5.
• the following Actions have canUndo/shouldUndo now true (although Undo/Redo return Action::failure):
  • MoleculeBondFileAction
  • MoleculeLoadAction
  • MoleculeRotateToPrincipalAxisSystemAction
  • MoleculeVerletIntegrationAction
• the following Action's regression tests have been corrected when Undo/Redo capability was already present (e.g. empty.conf created for Undo case):
  • MoleculeRotateAroundOrigin
  • MoleculeRotateAroundSelf
  • MoleculeRotateToPrincipalAxisSystem
  • MoleculeTranslation (also for periodic)
  • MpqcParser
  • PcpParser
  • PdbParser
  • TremoloParser
  • XyzParser
• FindNonConvexBorder(): status was always returned as false as all CheckListOfBaselines() had been commented out.

Location:

src/Actions/MoleculeAction

Files:

• BondFileAction.cpp (modified) (1 diff)
• LoadAction.cpp (modified) (1 diff)
• RotateAroundSelfByAngleAction.cpp (modified) (3 diffs)
• RotateToPrincipalAxisSystemAction.cpp (modified) (1 diff)
• VerletIntegrationAction.cpp (modified) (1 diff)

src/Actions/MoleculeAction/BondFileAction.cpp

@@ -69 +69 @@
 
 Action::state_ptr MoleculeBondFileAction::performRedo(Action::state_ptr _state){
-  // Undo and redo have to do the same for this action
-  return performUndo(_state);
+  return Action::failure;
 }
 
 bool MoleculeBondFileAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool MoleculeBondFileAction::shouldUndo() {
-  return false;
+  return true;
 }
 /** =========== end of function ====================== */

src/Actions/MoleculeAction/LoadAction.cpp

@@ -90 +90 @@
 
 bool MoleculeLoadAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool MoleculeLoadAction::shouldUndo() {
-  return false;
+  return true;
 }
 /** =========== end of function ====================== */

src/Actions/MoleculeAction/RotateAroundSelfByAngleAction.cpp

@@ -60 +60 @@
     // Creation Line that is the rotation axis
     Vector *CenterOfGravity = mol->DetermineCenterOfGravity();
+    DoLog(0) && (Log() << Verbose(0) <<  "Center of gravity is " << *CenterOfGravity << "." << std::endl);
     Line RotationAxis(*CenterOfGravity, params.Axis);
     delete(CenterOfGravity);
@@ -78 +79 @@
   BOOST_FOREACH(molecule *mol, state->selectedMolecules) {
     Vector *CenterOfGravity = mol->DetermineCenterOfGravity();
+    DoLog(0) && (Log() << Verbose(0) <<  "Center of gravity is " << *CenterOfGravity << "." << std::endl);
     Line RotationAxis(*CenterOfGravity, state->params.Axis);
     delete(CenterOfGravity);
+    DoLog(0) && (Log() << Verbose(0) << "Rotate " << mol->getName() << " around self by " << -state->params.angle << " radian around axis " << RotationAxis << "." << endl);
 
     for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {
@@ -94 +97 @@
   BOOST_FOREACH(molecule *mol, state->selectedMolecules) {
     Vector *CenterOfGravity = mol->DetermineCenterOfGravity();
+    DoLog(0) && (Log() << Verbose(0) <<  "Center of gravity is " << *CenterOfGravity << "." << std::endl);
     Line RotationAxis(*CenterOfGravity, state->params.Axis);
     delete(CenterOfGravity);
+    DoLog(0) && (Log() << Verbose(0) << "Rotate " << mol->getName() << " around self by " << state->params.angle << " radian around axis " << RotationAxis << "." << endl);
 
     for (molecule::iterator iter = mol->begin(); iter != mol->end(); ++iter) {

src/Actions/MoleculeAction/RotateToPrincipalAxisSystemAction.cpp

@@ -71 +71 @@
 
 Action::state_ptr MoleculeRotateToPrincipalAxisSystemAction::performRedo(Action::state_ptr _state){
-  // Undo and redo have to do the same for this action
-  return performUndo(_state);
+  return Action::failure;
 }
 
 bool MoleculeRotateToPrincipalAxisSystemAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool MoleculeRotateToPrincipalAxisSystemAction::shouldUndo() {
-  return false;
+  return true;
 }
 /** =========== end of function ====================== */

src/Actions/MoleculeAction/VerletIntegrationAction.cpp

@@ -72 +72 @@
 
 Action::state_ptr MoleculeVerletIntegrationAction::performRedo(Action::state_ptr _state){
-  // Undo and redo have to do the same for this action
-  return performUndo(_state);
+  return Action::failure;
 }
 
 bool MoleculeVerletIntegrationAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool MoleculeVerletIntegrationAction::shouldUndo() {
-  return false;
+  return true;
 }
 /** =========== end of function ====================== */