Changeset 6367dd for src/Actions

Timestamp:

Sep 19, 2013, 8:23:52 PM (12 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:

d649b7

Parents:

b5b01e

git-author:

Frederik Heber <heber@…> (08/19/13 16:17:07)

git-committer:

Frederik Heber <heber@…> (09/19/13 20:23:52)

Message:

ActionHistory now is part of ActionQueue.

• TESTFIX: changes to Actions unit tests due to ActionHistory inside ActionQueue.

Location:

src/Actions

Files:

• Action.cpp (modified) (2 diffs)
• ActionHistory.cpp (modified) (2 diffs)
• ActionHistory.hpp (modified) (5 diffs)
• ActionQueue.cpp (modified) (4 diffs)
• ActionQueue.hpp (modified) (3 diffs)
• RedoAction.cpp (modified) (2 diffs)
• UndoAction.cpp (modified) (2 diffs)
• pyMoleCuilder.cpp (modified) (3 diffs)
• unittests/ActionSequenceUnitTest.cpp (modified) (4 diffs)
• unittests/ManipulateAtomsUnitTest.cpp (modified) (3 diffs)

src/Actions/Action.cpp

@@ -41 +41 @@
 #include "Actions/Action.hpp"
 #include "Actions/ActionExceptions.hpp"
-#include "Actions/ActionHistory.hpp"
+#include "Actions/ActionQueue.hpp"
 #include "Actions/ActionRegistry.hpp"
 #include "Actions/OptionRegistry.hpp"
@@ -205 +205 @@
   if(shouldUndo() && state != failure){
     if(canUndo()){
-      ActionHistory::getInstance().addElement(this,state);
+      ActionQueue::getInstance().addElement(this,state);
     }
     else{
-      ActionHistory::getInstance().clear();
+      ActionQueue::getInstance().clear();
     }
   }

src/Actions/ActionHistory.cpp

@@ -41 +41 @@
 #include <iostream>
 
-#include "CodePatterns/Singleton_impl.hpp"
 #include "CodePatterns/Assert.hpp"
 
@@ -102 +101 @@
 }
 
-void ActionHistory::init(){
-  ActionHistory *hist = new ActionHistory();
-  setInstance(hist);
-}
-
-CONSTRUCT_SINGLETON(ActionHistory)
+//void ActionHistory::init(){
+//  ActionHistory *hist = new ActionHistory();
+//  setInstance(hist);
+//}
 
 /****************** Contained actions *******************/

src/Actions/ActionHistory.hpp

@@ -14 +14 @@
 #endif
 
-
-#include "CodePatterns/Singleton.hpp"
-
 #include <deque>
 
@@ -25 +22 @@
 namespace MoleCuilder {
 
-class ActionHistory : public Singleton<ActionHistory,false>
+class ActionHistory
 {
-  friend class Singleton<ActionHistory,false>;
-
   struct HistoryElement {
     HistoryElement(Action *_action, ActionState::ptr _state) :
@@ -39 +34 @@
 
 public:
+  ActionHistory();
+  ~ActionHistory();
 
   void undoLast();
@@ -48 +45 @@
   void addElement(Action*,ActionState::ptr);
   void clear();
-protected:
-  ActionHistory();
-  virtual ~ActionHistory();
+
 private:
   std::deque<HistoryElement> history;
@@ -60 +55 @@
   // inside a static initialization, so we have this init function that
   // needs to be called at a non-static point at the start of the program
-  static void init();
+//  static void init();
 };
 

src/Actions/ActionQueue.cpp

@@ -43 +43 @@
 #include <vector>
 
+#include "Actions/ActionHistory.hpp"
 #include "Actions/ActionRegistry.hpp"
 
@@ -48 +49 @@
 
 ActionQueue::ActionQueue() :
-    AR(new ActionRegistry())
+    AR(new ActionRegistry()),
+    history(new ActionHistory)
 {}
 
 ActionQueue::~ActionQueue()
 {
+  delete history;
   delete AR;
 }
@@ -78 +81 @@
 }
 
+void ActionQueue::addElement(Action* _Action,ActionState::ptr _state)
+{
+  history->addElement(_Action, _state);
+}
+
+void ActionQueue::clear()
+{
+  history->clear();
+}
+
+
 const ActionQueue::ActionTokens_t ActionQueue::getListOfActions() const
 {
@@ -90 +104 @@
 }
 
+void ActionQueue::undoLast()
+{
+        history->undoLast();
+}
+
+void ActionQueue::redoLast()
+{
+        history->redoLast();
+}
+
+
 CONSTRUCT_SINGLETON(ActionQueue)

src/Actions/ActionQueue.hpp

@@ -24 +24 @@
 
 class Action;
+class ActionHistory;
 class ActionRegistry;
 class ActionTrait;
@@ -82 +83 @@
   }
 
+  /** Undoes last called Action.
+   *
+   */
+  void undoLast();
+
+  /** Redoes last undone Action.
+   *
+   */
+  void redoLast();
+
+private:
+  //!> grant Action access to internal history functions.
+  friend class Action;
+
+  /** Wrapper function to add state to ActionHistory.
+   *
+   * \param _Action Action whose state to add
+   * \param _state state to add
+   */
+  void addElement(Action* _Action, ActionState::ptr _state);
+
+  /** Wrapper function to clear ActionHistory.
+   *
+   */
+  void clear();
+
 private:
   /** Private cstor for ActionQueue.
@@ -98 +125 @@
   ActionRegistry *AR;
 
+  //!> ActionHistory is for undoing and redoing actions, requires ActionRegistry fully initialized
+  ActionHistory *history;
+
   //!> internal queue of actions
   ActionQueue_t queue;

src/Actions/RedoAction.cpp

@@ -36 +36 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "ActionHistory.hpp"
+#include "ActionQueue.hpp"
 
 #include <iostream>
@@ -53 +53 @@
 ActionState::ptr RedoAction::performCall(){
   std::cout << "Redo" << std::endl;
-  ActionHistory::getInstance().redoLast();
+  ActionQueue::getInstance().redoLast();
   return Action::success;
 }

src/Actions/UndoAction.cpp

@@ -35 +35 @@
 #include "CodePatterns/MemDebug.hpp"
 
-#include "ActionHistory.hpp"
+#include "ActionQueue.hpp"
 
 #include <iostream>
@@ -52 +52 @@
 ActionState::ptr UndoAction::performCall(){
   std::cout << "Undo" << std::endl;
-  ActionHistory::getInstance().undoLast();
+  ActionQueue::getInstance().undoLast();
   return Action::success;
 }

src/Actions/pyMoleCuilder.cpp

@@ -47 +47 @@
 
 #include "cleanUp.hpp"
-#include "Actions/ActionHistory.hpp"
-#include "cleanUp.hpp"
 
 namespace MoleCuilder {
@@ -74 +72 @@
   // need to init the history before any action is created
   std::cout << "Reinitializing." << std::endl;
-  MoleCuilder::ActionHistory::init();
 }
 
@@ -117 +114 @@
 BOOST_PYTHON_MODULE(pyMoleCuilder)
 {
-  // need to init the history before any action is created
-  MoleCuilder::ActionHistory::init();
-
   // from this moment on, we need to be sure to deeinitialize in the correct order
   // this is handled by the cleanup function

src/Actions/unittests/ActionSequenceUnitTest.cpp

@@ -40 +40 @@
 #include "ActionSequenceUnitTest.hpp"
 #include "Actions/Action.hpp"
-#include "Actions/ActionHistory.hpp"
 #include "Actions/ActionQueue.hpp"
 #include "Actions/ActionSequence.hpp"
@@ -156 +155 @@
 void ActionSequenceTest::setUp(){
   hasDescriptor = false;
-  ActionHistory::init();
+  // setup ActionHistory
+  ActionQueue::getInstance();
   // TODO: find a way to really reset the factory to a clean state in tear-down
   if(!hasDescriptor){
@@ -190 +190 @@
   delete shouldNotCall2;
 
-  ActionHistory::purgeInstance();
   ActionQueue::purgeInstance();
   {
@@ -285 +284 @@
   CPPUNIT_ASSERT_EQUAL(true,wasCalled2->wasCalled());
 
-  ActionHistory::getInstance().undoLast();
+  ActionQueue::getInstance().undoLast();
 
   CPPUNIT_ASSERT_EQUAL(false,wasCalled1->wasCalled());

src/Actions/unittests/ManipulateAtomsUnitTest.cpp

@@ -44 +44 @@
 #include "Actions/ManipulateAtomsProcess.hpp"
 #include "Actions/ActionQueue.hpp"
-#include "Actions/ActionHistory.hpp"
 
 #include "World.hpp"
@@ -105 +104 @@
 void manipulateAtomsTest::setUp(){
   hasDescriptor = false;
-  ActionHistory::init();
   World::getInstance();
+
+  // setup ActionHistory
+  ActionQueue::getInstance();
+
   // TODO: find a way to really reset the factory to a clean state in tear-down
   if(!hasDescriptor){
@@ -121 +123 @@
   World::purgeInstance();
   ActionQueue::purgeInstance();
-  ActionHistory::purgeInstance();
   {
     UIFactory::purgeInstance();