Changeset 220cf64 for src

Timestamp:

Oct 12, 2011, 2:10:51 PM (13 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:

c8b17b

Parents:

35a25a

git-author:

Frederik Heber <heber@…> (09/09/11 16:54:58)

git-committer:

Frederik Heber <heber@…> (10/12/11 14:10:51)

Message:

Added Undo/Redo capability to ElementDbAction.

• thanks to serialization of periodentafel and element.
• !NOTE! when serializing pointers inside classes: header file of this class must at some point be present (due to the templated serialize function).
• TESTFIX: Updated regression test for ElementDbAction. Loaded databases are now different and this reflects in .conf output file.

Location:

src

Files:

• Actions/CommandAction/ElementDbAction.cpp (modified) (3 diffs)
• Actions/CommandAction/ElementDbAction.def (modified) (2 diffs)
• Actions/CommandAction/ElementDbAction.hpp (modified) (1 diff)
• unittests/PeriodentafelUnitTest.hpp (modified) (1 diff)

src/Actions/CommandAction/ElementDbAction.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 "CodePatterns/MemDebug.hpp"
 
 #include "config.hpp"
+#include "element.hpp"    // we need element because of serialization!
+#include "periodentafel.hpp"
 #include "CodePatterns/Log.hpp"
-#include "periodentafel.hpp"
 #include "CodePatterns/Verbose.hpp"
 #include "World.hpp"
 
-#include <iostream>
 #include <string>
 
-using namespace std;
 
 #include "Actions/CommandAction/ElementDbAction.hpp"
@@ -35 +38 @@
 // and construct the stuff
 #include "ElementDbAction.def"
-#include "Action_impl_pre.hpp"
+#include "Actions/Action_impl_pre.hpp"
+
 /** =========== define the function ====================== */
 Action::state_ptr CommandElementDbAction::performCall() {
-  ostringstream usage;
+  std::ostringstream usage;
 
   // obtain information
   getParametersfromValueStorage();
+  periodentafel *periode = World::getInstance().getPeriode();
+
+  // create undo state
+  std::stringstream undostream;
+  boost::archive::text_oarchive oa(undostream);
+  oa << periode;
+  CommandElementDbState *UndoState =
+      new CommandElementDbState(
+          undostream.str(),
+          params
+          );
 
   // get the path
@@ -49 +64 @@
 
   // load table
+  if (periode->LoadPeriodentafel(configuration->databasepath)) {
+    DoLog(0) && (Log() << Verbose(0) << "Element list loaded successfully." << endl);
+    //periode->Output();
+    return Action::state_ptr(UndoState);
+  } else {
+    DoLog(0) && (Log() << Verbose(0) << "Element list loading failed." << endl);
+    return Action::failure;
+  }
+}
+
+Action::state_ptr CommandElementDbAction::performUndo(Action::state_ptr _state) {
+  CommandElementDbState *state = assert_cast<CommandElementDbState*>(_state.get());
+
+  periodentafel *periode;
+
+  std::stringstream undostream(state->undostring);
+  boost::archive::text_iarchive ia(undostream);
+  ia >> periode;
+
+  delete World::getInstance().getPeriode();
+  World::getInstance().getPeriode() = periode;
+
+  return Action::state_ptr(_state);
+}
+
+Action::state_ptr CommandElementDbAction::performRedo(Action::state_ptr _state){
+  CommandElementDbState *state = assert_cast<CommandElementDbState*>(_state.get());
+
+  // get the path
+  // TODO: Make databasepath a std::string
+  config *configuration = World::getInstance().getConfig();
+  strcpy(configuration->databasepath, state->params.databasepath.branch_path().string().c_str());
+
+  // load table
   periodentafel *periode = World::getInstance().getPeriode();
   if (periode->LoadPeriodentafel(configuration->databasepath)) {
     DoLog(0) && (Log() << Verbose(0) << "Element list loaded successfully." << endl);
     //periode->Output();
-    return Action::success;
+    return Action::state_ptr(_state);
   } else {
     DoLog(0) && (Log() << Verbose(0) << "Element list loading failed." << endl);
     return Action::failure;
   }
-
-}
-
-Action::state_ptr CommandElementDbAction::performUndo(Action::state_ptr _state) {
-//  ParserLoadXyzState *state = assert_cast<ParserLoadXyzState*>(_state.get());
-
-  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 CommandElementDbAction::performRedo(Action::state_ptr _state){
-  return Action::failure;
 }
 
 bool CommandElementDbAction::canUndo() {
-  return false;
+  return true;
 }
 
 bool CommandElementDbAction::shouldUndo() {
-  return false;
+  return true;
 }
 /** =========== end of function ====================== */

src/Actions/CommandAction/ElementDbAction.def

@@ -7 +7 @@
 
 // all includes and forward declarations necessary for non-integral types below
-
+#include <sstream>
 
 // i.e. there is an integer with variable name Z that can be found in
@@ -18 +18 @@
 #define paramreferences (databasepath)
 
-#undef statetypes
-#undef statereferences
+#define statetypes (std::string)
+#define statereferences (undostring)
 
 // some defines for all the names, you may use ACTION, STATE and PARAMS

src/Actions/CommandAction/ElementDbAction.hpp

@@ -18 +18 @@
 
 #include "ElementDbAction.def"
-#include "Action_impl_header.hpp"
+#include "Actions/Action_impl_header.hpp"
 
 #endif /* ELEMENTDBACTION_HPP_ */

src/unittests/PeriodentafelUnitTest.hpp

@@ -47 +47 @@
 };
 
+std::string gatherUndoInformation(const periodentafel &periode);
+
+
 #endif /* PERIODENTAFELUNITTEST_HPP_ */