Changeset c2e567

Timestamp:

Oct 12, 2011, 2:10:57 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:

c074cc

Parents:

29cbe9

git-author:

Frederik Heber <heber@…> (09/12/11 08:46:41)

git-committer:

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

Message:

Added serialization capability to RealSpaceMatrix.

• added SerializationTest to MatrixUnitTest.
• Requires CodePatterns 1.1.5 due to serialization header and problems with MemDebug.

Location:

LinearAlgebra

Files:

• configure.ac (modified) (1 diff)
• src/LinearAlgebra/RealSpaceMatrix.hpp (modified) (3 diffs)
• src/unittests/Makefile.am (modified) (1 diff)
• src/unittests/RealSpaceMatrixUnitTest.cpp (modified) (2 diffs)
• src/unittests/RealSpaceMatrixUnitTest.hpp (modified) (2 diffs)

LinearAlgebra/configure.ac

@@ -104 +104 @@
 AC_CHECK_LIB(m, sqrt, , AC_MSG_ERROR([compatible libc math library not found]))
 
-# CodePatterns library (needs operator<<(.., range<>) ) 
-AM_PATH_CODEPATTERNS([1.0.13], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
+# CodePatterns library (serialization header before MemDebug.hpp ) 
+AM_PATH_CODEPATTERNS([1.1.5], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
 
 # boost

LinearAlgebra/src/LinearAlgebra/RealSpaceMatrix.hpp

@@ -14 +14 @@
 #endif
 
+#include "boost/serialization/access.hpp"
+#include <boost/serialization/split_member.hpp>
+//#include "boost/serialization/export.hpp"
 
 #include <iosfwd>
@@ -156 +159 @@
   bool operator==(const RealSpaceMatrix&) const;
 
+  bool operator!=(const RealSpaceMatrix &other) const {
+    return !(*this == other);
+  }
+
+private:
+  friend class boost::serialization::access;
+  // serialization
+  template<class Archive>
+  void save(Archive & ar, const unsigned int version) const
+  {
+    ar & content;
+  }
+  template<class Archive>
+  void load(Archive & ar, const unsigned int version)
+  {
+    ar & content;
+    createViews();
+  }
+  BOOST_SERIALIZATION_SPLIT_MEMBER()
+
 private:
   RealSpaceMatrix(MatrixContent*);
   void createViews();
+
   MatrixContent *content;
   // we keep around some Vector views of the matrix, to return references
@@ -165 +189 @@
   Vector* diagonal_ptr;
 };
+//BOOST_CLASS_EXPORT_GUID(RealSpaceMatrix, "RealSpaceMatrix")
 
 const RealSpaceMatrix operator*(const double,const RealSpaceMatrix&);

LinearAlgebra/src/unittests/Makefile.am

@@ -74 +74 @@
         RealSpaceMatrixUnitTest.cpp \
         RealSpaceMatrixUnitTest.hpp
-RealSpaceMatrixUnitTest_LDADD = ${GSLLIBS}
+RealSpaceMatrixUnitTest_LDADD = ${GSLLIBS} \
+        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
 
 VectorContentUnitTest_SOURCES = UnitTestMain.cpp \

LinearAlgebra/src/unittests/RealSpaceMatrixUnitTest.cpp

@@ -27 +27 @@
 #include "RealSpaceMatrixUnitTest.hpp"
 
+// include headers that implement a archive in simple text format
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/text_iarchive.hpp>
+
 #include "defs.hpp"
 #include "Exceptions.hpp"
+#include "MatrixContent.hpp"
 #include "RealSpaceMatrix.hpp"
 #include "Vector.hpp"
@@ -366 +371 @@
   CPPUNIT_ASSERT_EQUAL((*perm5)*t,Vector(2,3,1));
 }
+
+void RealSpaceMatrixTest::SerializationTest()
+{
+  // write element to stream
+  std::stringstream stream;
+  boost::archive::text_oarchive oa(stream);
+  oa << diagonal;
+
+  //std::cout << "Contents of archive is " << stream.str() << std::endl;
+
+  // create and open an archive for input
+  boost::archive::text_iarchive ia(stream);
+  // read class state from archive
+  RealSpaceMatrix *newm;
+
+  ia >> newm;
+
+  CPPUNIT_ASSERT (*diagonal == *newm);
+}

LinearAlgebra/src/unittests/RealSpaceMatrixUnitTest.hpp

@@ -30 +30 @@
   CPPUNIT_TEST ( DeterminantTest );
   CPPUNIT_TEST ( VecMultTest );
+  CPPUNIT_TEST ( SerializationTest );
   CPPUNIT_TEST_SUITE_END();
 
@@ -44 +45 @@
   void DeterminantTest();
   void VecMultTest();
+  void SerializationTest();
 
   RealSpaceMatrix *zero;