Changeset 184d89 for src/Fragmentation

Timestamp:

May 5, 2017, 2:17:48 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, AutomationFragmentation_failures, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes

Children:

5fea7d

Parents:

dde50d

git-author:

Frederik Heber <heber@…> (04/05/17 17:19:49)

git-committer:

Frederik Heber <frederik.heber@…> (05/05/17 14:17:48)

Message:

FIX: MatrixContainer's serialize() was broken because default cstor initialized some members.

• boost::serialization somehow changed its default behavior when deserializing vectors. Now, if the member variables are vectors and initialized with some initial elements, then these are kept and the new elements just added on top. Before, the vector was cleared and set equal to the serialized elements.
• Now, we have split MatrixContainer serialize() into load()/save() where we clear the member variables in question first.

Location:

src/Fragmentation

Files:

• MatrixContainer.cpp (modified) (1 diff)
• MatrixContainer.hpp (modified) (3 diffs)

src/Fragmentation/MatrixContainer.cpp

@@ -32 +32 @@
 #include <config.h>
 #endif
+
+// include headers that implement a archive in simple text format
+// otherwise BOOST_CLASS_EXPORT_IMPLEMENT has no effect
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/text_iarchive.hpp>
 
 //#include "CodePatterns/MemDebug.hpp"

src/Fragmentation/MatrixContainer.hpp

@@ -16 +16 @@
 #include <vector>
 
+#include "boost/serialization/serialization.hpp"
+#include <boost/serialization/split_member.hpp>
 #include "boost/serialization/vector.hpp"
 
@@ -64 +66 @@
   friend class boost::serialization::access;
   // serialization
-  template<class Archive>
-  void serialize(Archive & ar, const unsigned int version)
+  template <typename Archive>
+  void load(Archive& ar, const unsigned int version)
+  {
+    // default cstor resizes these three to 1, serialization will add more
+    // members instead of starting new
+    Header.clear();
+    RowCounter.clear();
+    ColumnCounter.clear();
+    ar & Matrix;
+    ar & Indices;
+    ar & Header;
+    ar & MatrixCounter;
+    ar & RowCounter;
+    ar & ColumnCounter;
+  }
+  template <typename Archive>
+  void save(Archive& ar, const unsigned int version) const
   {
     ar & Matrix;
@@ -74 +91 @@
     ar & ColumnCounter;
   }
+
+  BOOST_SERIALIZATION_SPLIT_MEMBER()
 };