Changeset 29cbe9 for LinearAlgebra/src/unittests

Timestamp:

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

Location:

LinearAlgebra/src/unittests

Files:

• Makefile.am (modified) (3 diffs)
• MatrixContentUnitTest.cpp (modified) (2 diffs)
• MatrixContentUnitTest.hpp (modified) (2 diffs)
• VectorContentUnitTest.cpp (modified) (2 diffs)
• VectorContentUnitTest.hpp (modified) (2 diffs)

LinearAlgebra/src/unittests/Makefile.am

@@ -5 +5 @@
 
 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
-AM_CPPFLAGS = $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+AM_CPPFLAGS = $(CPPUNIT_CFLAGS) $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
 
 TESTS = \
@@ -63 +63 @@
         MatrixContentUnitTest.cpp \
         MatrixContentUnitTest.hpp
-MatrixContentUnitTest_LDADD = ${GSLLIBS}
+MatrixContentUnitTest_LDADD = ${GSLLIBS} \
+        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
 
 PlaneUnitTest_SOURCES = UnitTestMain.cpp \
@@ -78 +79 @@
         VectorContentUnitTest.cpp \
         VectorContentUnitTest.hpp
-VectorContentUnitTest_LDADD = ${GSLLIBS}
+VectorContentUnitTest_LDADD = ${GSLLIBS} \
+        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
 
 VectorUnitTest_SOURCES = UnitTestMain.cpp \

LinearAlgebra/src/unittests/MatrixContentUnitTest.cpp

@@ -26 +26 @@
 #include <cmath>
 #include <limits>
+
+// include headers that implement a archive in simple text format
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/text_iarchive.hpp>
 
 #include "MatrixContentUnitTest.hpp"
@@ -348 +352 @@
   }
 }
+
+/** Unit test for serialization
+ *
+ */
+void MatrixContentTest::SerializationTest()
+{
+  m->setZero();
+  int count=0;
+  for (size_t x = 0; x < 4 ; ++x)
+    for (size_t y = 0; y < 3 ; ++y)
+      m->at(x,y) = count++;
+  // write element to stream
+  std::stringstream stream;
+  boost::archive::text_oarchive oa(stream);
+  oa << m;
+
+  //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
+  MatrixContent *newm;
+
+  ia >> newm;
+
+  CPPUNIT_ASSERT (*m == *newm);
+}

LinearAlgebra/src/unittests/MatrixContentUnitTest.hpp

@@ -31 +31 @@
     CPPUNIT_TEST (ReadWriteTest );
     CPPUNIT_TEST (SVDTest );
+    CPPUNIT_TEST (SerializationTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -44 +45 @@
     void ReadWriteTest();
     void SVDTest();
+    void SerializationTest();
 
 private:

LinearAlgebra/src/unittests/VectorContentUnitTest.cpp

@@ -23 +23 @@
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <cppunit/ui/text/TestRunner.h>
+
+// include headers that implement a archive in simple text format
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/archive/text_iarchive.hpp>
 
 #include "VectorContentUnitTest.hpp"
@@ -197 +201 @@
   CPPUNIT_ASSERT_EQUAL( v, w );
 }
+
+/** UnitTest for serialization.
+ */
+void VectorContentTest::SerializationTest()
+{
+  v->setZero();
+  (*v)[0] = 0.;
+  (*v)[1] = 1.;
+  (*v)[2] = 2.;
+  // write element to stream
+  std::stringstream stream;
+  boost::archive::text_oarchive oa(stream);
+  oa << v;
+
+  //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
+  VectorContent *newv;
+
+  ia >> newv;
+
+  CPPUNIT_ASSERT (*v == *newv);
+}

LinearAlgebra/src/unittests/VectorContentUnitTest.hpp

@@ -31 +31 @@
     CPPUNIT_TEST (OperatorIsTest );
     CPPUNIT_TEST (ReadWriteTest );
+    CPPUNIT_TEST (SerializationTest );
     CPPUNIT_TEST_SUITE_END();
 
@@ -44 +45 @@
     void OperatorAlgebraTest();
     void ReadWriteTest();
+    void SerializationTest();
 
 private: