Changeset 29cbe9 for LinearAlgebra/src/LinearAlgebra/MatrixContent.hpp

Timestamp:

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

c2e567

Parents:

c5038e

git-author:

Frederik Heber <heber@…> (09/09/11 21:30:06)

git-committer:

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

Message:

Added serialization capabilities to VectorContent and MatrixContent.

• both a bit tricky due to gsl_vector and gsl_malloc.
• TEST: also added SerializationTest() to either UnitTest.

File:

• LinearAlgebra/src/LinearAlgebra/MatrixContent.hpp (modified) (3 diffs)

LinearAlgebra/src/LinearAlgebra/MatrixContent.hpp

@@ -15 +15 @@
 
 #include "CodePatterns/Assert.hpp"
+
+#include <boost/serialization/array.hpp>
+#include <boost/serialization/split_member.hpp>
 
 /** MatrixContent is a wrapper for gsl_matrix.
@@ -165 +168 @@
   void write(std::ostream &ost) const;
 
+  bool operator!=(const MatrixContent &other) const {
+    return !(*this == other);
+  }
+
+private:
+  MatrixContent();
+  friend class boost::serialization::access;
+  // serialization (due to gsl_vector separate versions needed)
+  template<class Archive>
+  void save(Archive & ar, const unsigned int version) const
+  {
+    ar & boost::serialization::base_object<MatrixDimension>(*this);
+    ar & content->size1;
+    ar & content->size2;
+    ar & content->tda;
+    ar & boost::serialization::make_array<double>(content->data, content->size1*content->tda);
+  }
+  template<class Archive>
+  void load(Archive & ar, const unsigned int version)
+  {
+    ar & boost::serialization::base_object<MatrixDimension>(*this);
+    content = gsl_matrix_calloc(getRows(), getColumns());
+    ar & content->size1;
+    ASSERT(getRows() == content->size1,
+        "MatrixContent::load() - rows dimension mismatch: "
+        +toString(getRows())+" != "+toString(content->size1)+".");
+    ar & content->size2;
+    ASSERT(getColumns() == content->size2,
+        "MatrixContent::load() - columns dimension mismatch: "
+        +toString(getColumns())+" != "+toString(content->size2)+".");
+    size_t tda = 0;
+    ar & tda;
+    ASSERT(tda == content->tda,
+        "MatrixContent::load() - trailing dimension mismatch: "
+        +toString(tda)+" != "+toString(content->tda)+".");
+    ar & boost::serialization::make_array<double>(content->data, content->size1*tda);
+    // this is always a copy, hence always free
+    free_content_on_exit = true;
+  }
+  BOOST_SERIALIZATION_SPLIT_MEMBER()
+
 protected:
   double *Pointer(size_t m, size_t n);
@@ -174 +218 @@
   bool free_content_on_exit;
 };
+//BOOST_CLASS_EXPORT_GUID(MatrixContent, "MatrixContent")
 
 std::ostream & operator<<(std::ostream &ost, const MatrixContent &mat);