Changes in src/Actions/WorldAction/CenterInBoxAction.cpp [23526c:ce7fdc]

File:

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

src/Actions/WorldAction/CenterInBoxAction.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 <boost/shared_ptr.hpp>
 
 #include "Box.hpp"
 #include "CodePatterns/Log.hpp"
-#include "LinearAlgebra/MatrixContent.hpp"
 #include "LinearAlgebra/RealSpaceMatrix.hpp"
 #include "molecule.hpp"
@@ -36 +28 @@
 #include <iostream>
 #include <string>
-#include <vector>
 
 #include "Actions/WorldAction/CenterInBoxAction.hpp"
@@ -50 +41 @@
   getParametersfromValueStorage();
 
-  // create undo state
-  std::stringstream undostream;
-  boost::archive::text_oarchive oa(undostream);
-  RealSpaceMatrix matrix(World::getInstance().getDomain().getM());
-  oa << matrix;
-  std::vector< boost::shared_ptr<Vector> > OldPositions;
-  std::vector<molecule*> AllMolecules = World::getInstance().getAllMolecules();
-  for (std::vector<molecule*>::iterator MolRunner = AllMolecules.begin();
-      MolRunner != AllMolecules.end();
-      ++MolRunner) {
-    for(molecule::const_iterator AtomRunner = (*MolRunner)->begin();
-        AtomRunner != (*MolRunner)->end();
-        ++AtomRunner) {
-      OldPositions.push_back(
-          boost::shared_ptr<Vector>(new Vector(
-              (*AtomRunner)->getPosition()
-              ))
-          );
-    }
-  }
-
-  // set new domain
   World::getInstance().setDomain(params.cell_size.getM());
 
-  // center atoms
-  for (std::vector<molecule*>::iterator MolRunner = AllMolecules.begin(); MolRunner != AllMolecules.end(); ++MolRunner) {
+  // center
+  vector<molecule *> AllMolecules = World::getInstance().getAllMolecules();
+  for (vector<molecule*>::iterator MolRunner = AllMolecules.begin(); MolRunner != AllMolecules.end(); ++MolRunner) {
     (*MolRunner)->CenterInBox();
   }
@@ -82 +52 @@
   LOG(0, "Box domain is now " << World::getInstance().getDomain().getM());
 
-  // create undo state
-  WorldCenterInBoxState *UndoState =
-      new WorldCenterInBoxState(
-          undostream.str(),
-          OldPositions,
-          params
-          );
-
-  return Action::state_ptr(UndoState);
+  return Action::success;
 }
 
 Action::state_ptr WorldCenterInBoxAction::performUndo(Action::state_ptr _state) {
-  WorldCenterInBoxState *state = assert_cast<WorldCenterInBoxState*>(_state.get());
+//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
 
-  // restore domain
-  RealSpaceMatrix matrix;
-  std::stringstream undostream(state->undostring);
-  boost::archive::text_iarchive ia(undostream);
-  ia >> matrix;
-  World::getInstance().setDomain(matrix);
-
-  // place atoms on old positions
-  std::vector< boost::shared_ptr<Vector> >::const_iterator OldPositionsIter = state->OldPositions.begin();
-  std::vector<molecule*> AllMolecules = World::getInstance().getAllMolecules();
-  for (std::vector<molecule*>::iterator MolRunner = AllMolecules.begin();
-      MolRunner != AllMolecules.end();
-      ++MolRunner) {
-    for(molecule::const_iterator AtomRunner = (*MolRunner)->begin();
-        AtomRunner != (*MolRunner)->end();
-        ++AtomRunner) {
-      ASSERT(OldPositionsIter != state->OldPositions.end(),
-          "WorldBoundInBoxAction::performUndo() - too few positions stored in UndoState.");
-      (*AtomRunner)->setPosition(**(OldPositionsIter++));
-    }
-  }
-
-  // give final box size
-  LOG(0, "Box domain restored to " << World::getInstance().getDomain().getM());
-
-  return Action::state_ptr(_state);
+  return Action::failure;
+//  string newName = state->mol->getName();
+//  state->mol->setName(state->lastName);
+//
+//  return Action::state_ptr(new ParserLoadXyzState(state->mol,newName));
 }
 
 Action::state_ptr WorldCenterInBoxAction::performRedo(Action::state_ptr _state){
-  WorldCenterInBoxState *state = assert_cast<WorldCenterInBoxState*>(_state.get());
-
-  // set new domain
-  World::getInstance().setDomain(state->params.cell_size.getM());
-
-  // center atoms
-  std::vector<molecule *> AllMolecules = World::getInstance().getAllMolecules();
-  for (std::vector<molecule*>::iterator MolRunner = AllMolecules.begin(); MolRunner != AllMolecules.end(); ++MolRunner) {
-    (*MolRunner)->CenterInBox();
-  }
-
-  // give final box size
-  LOG(0, "Box domain is again " << World::getInstance().getDomain().getM());
-
-  return Action::state_ptr(_state);
+  return Action::failure;
 }
 
 bool WorldCenterInBoxAction::canUndo() {
-  return true;
+  return false;
 }
 
 bool WorldCenterInBoxAction::shouldUndo() {
-  return true;
+  return false;
 }
 /** =========== end of function ====================== */