Changes in src/Actions/WorldAction/CenterOnEdgeAction.cpp [ce7fdc:de7d1d]

File:

• src/Actions/WorldAction/CenterOnEdgeAction.cpp (modified) (4 diffs)

src/Actions/WorldAction/CenterOnEdgeAction.cpp

@@ -18 +18 @@
 #endif
 
+// include headers that implement a archive in simple text format
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/text_iarchive.hpp>
+#include "boost/serialization/vector.hpp"
+
 #include "CodePatterns/MemDebug.hpp"
 
 #include "atom.hpp"
 #include "CodePatterns/Log.hpp"
+#include "LinearAlgebra/MatrixContent.hpp"
+#include "LinearAlgebra/RealSpaceMatrix.hpp"
 #include "LinearAlgebra/Vector.hpp"
+#include "molecule.hpp"
 #include "World.hpp"
-#include "LinearAlgebra/RealSpaceMatrix.hpp"
 
 #include <iostream>
 #include <string>
+#include <vector>
 
 #include "Actions/WorldAction/CenterOnEdgeAction.hpp"
@@ -44 +52 @@
   getParametersfromValueStorage();
 
+  // create undo state
+  std::stringstream undostream;
+  boost::archive::text_oarchive oa(undostream);
+  const RealSpaceMatrix &matrix = World::getInstance().getDomain().getM();
+  oa << matrix;
+  std::vector< boost::shared_ptr<Vector> > OldPositions;
+  std::vector<atom *> AllAtoms = World::getInstance().getAllAtoms();
+  for (std::vector<atom *>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner)
+    OldPositions.push_back(
+        boost::shared_ptr<Vector>(new Vector(
+            (*AtomRunner)->getPosition()
+            ))
+        );
+
   // get maximum and minimum
-  vector<atom *> AllAtoms = World::getInstance().getAllAtoms();
   ASSERT(AllAtoms.size() > 0, "For CenteronEdge atoms must be present.");
-  vector<atom *>::iterator AtomRunner = AllAtoms.begin();
+  std::vector<atom *>::iterator AtomRunner = AllAtoms.begin();
   Min = (*AtomRunner)->getPosition();
   Max = (*AtomRunner)->getPosition();
@@ -67 +88 @@
   World::getInstance().setDomain(domain);
   // translate all atoms, such that Min is aty (0,0,0)
-  for (vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner)
+  for (std::vector<atom*>::iterator AtomRunner = AllAtoms.begin(); AtomRunner != AllAtoms.end(); ++AtomRunner)
     *(*AtomRunner) -= Min;
 
@@ -73 +94 @@
   LOG(0, "Box domain is now " << World::getInstance().getDomain().getM());
 
-  return Action::success;
+  // create undo state
+  WorldCenterOnEdgeState *UndoState =
+      new WorldCenterOnEdgeState(
+          undostream.str(),
+          Min,
+          Max,
+          params
+          );
+
+  return Action::state_ptr(UndoState);
 }
 
 Action::state_ptr WorldCenterOnEdgeAction::performUndo(Action::state_ptr _state) {
-//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
+  WorldCenterOnEdgeState *state = assert_cast<WorldCenterOnEdgeState*>(_state.get());
 
-  return Action::failure;
-//  string newName = state->mol->getName();
-//  state->mol->setName(state->lastName);
-//
-//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
+  // restore domain
+  RealSpaceMatrix matrix;
+  std::stringstream undostream(state->undostring);
+  boost::archive::text_iarchive ia(undostream);
+  ia >> matrix;
+  World::getInstance().setDomain(matrix);
+
+  // translate all atoms back
+  std::vector<atom *> AllAtoms = World::getInstance().getAllAtoms();
+  for (vector<atom*>::iterator AtomRunner = AllAtoms.begin();
+      AtomRunner != AllAtoms.end();
+      ++AtomRunner)
+    *(*AtomRunner) += state->Min;
+
+  // give final box size
+  LOG(0, "Box domain restored to " << World::getInstance().getDomain().getM());
+
+  return Action::state_ptr(_state);
 }
 
 Action::state_ptr WorldCenterOnEdgeAction::performRedo(Action::state_ptr _state){
-  return Action::failure;
+  WorldCenterOnEdgeState *state = assert_cast<WorldCenterOnEdgeState*>(_state.get());
+
+  // set new box size
+  RealSpaceMatrix rmatrix;
+  for (int i=0;i<NDIM;i++) {
+    double tmp = state->Max[i]-state->Min[i];
+    tmp = fabs(tmp)>=1. ? tmp : 1.0;
+    rmatrix.at(i,i) = tmp;
+  }
+  World::getInstance().setDomain(rmatrix);
+  // translate all atoms, such that Min is aty (0,0,0)
+  std::vector<atom *> AllAtoms = World::getInstance().getAllAtoms();
+  for (vector<atom*>::iterator AtomRunner = AllAtoms.begin();
+      AtomRunner != AllAtoms.end();
+      ++AtomRunner)
+    *(*AtomRunner) -= state->Min;
+
+  // give final box size
+  LOG(0, "Box domain is again " << World::getInstance().getDomain().getM());
+
+  return Action::state_ptr(_state);
 }
 
 bool WorldCenterOnEdgeAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool WorldCenterOnEdgeAction::shouldUndo() {
-  return false;
+  return true;
 }
 /** =========== end of function ====================== */