Context Navigation

-              rc5038e
+              r29cbe9
 AM_PATH_CODEPATTERNS([1.0.13], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
+# boost
+BOOST_REQUIRE([1.40])
 # boost headers
-BOOST_REQUIRE([1.40])
 BOOST_BIND
 BOOST_EXCEPTION
+# boost libraries
+BOOST_SERIALIZATION
 # Checks for header files.

LinearAlgebra/src/LinearAlgebra/Makefile.am

rc5038e	r29cbe9
49	49	libLinearAlgebra_la_includedir = $(includedir)/MoleCuilder/LinearAlgebra/
50	50	libLinearAlgebra_la_LIBADD = \
	51	$(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS) \
51	52	$(GSL_LIBS)
52	53	nobase_libLinearAlgebra_la_include_HEADERS = ${LINALGHEADER}

LinearAlgebra/src/LinearAlgebra/MatrixContent.cpp

-              rc5038e
+              r29cbe9
 #include <set>
+/** Constructor for class MatrixContent.
+ *
+ * This cstor is only present for serialization purposes.
+ *
+ */
+MatrixContent::MatrixContent() :
+    MatrixDimension(0,0),
+    content(NULL),
+    free_content_on_exit(true)
+{
+}
 /** Constructor for class MatrixContent.

LinearAlgebra/src/LinearAlgebra/MatrixContent.hpp

-              rc5038e
+              r29cbe9
 #include "CodePatterns/Assert.hpp"
+#include <boost/serialization/array.hpp>
+#include <boost/serialization/split_member.hpp>
 /** MatrixContent is a wrapper for gsl_matrix.
 …
   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);
 …
   bool free_content_on_exit;
 };
+//BOOST_CLASS_EXPORT_GUID(MatrixContent, "MatrixContent")
 std::ostream & operator<<(std::ostream &ost, const MatrixContent &mat);

LinearAlgebra/src/LinearAlgebra/VectorContent.cpp

-              rc5038e
+              r29cbe9
 #include "Vector.hpp"
 #include "VectorContent.hpp"
+/** Constructor of class VectorContent.
+ *
+ * This cstor is only present for serialization purposes.
+ *
+ */
+VectorContent::VectorContent() :
+  VectorDimension(0),
+  content(NULL),
+  free_content_on_exit(true)
+{}
 /** Constructor of class VectorContent.

LinearAlgebra/src/LinearAlgebra/VectorContent.hpp

-              rc5038e
+              r29cbe9
 #include "CodePatterns/Assert.hpp"
+#include <boost/serialization/array.hpp>
+#include <boost/serialization/split_member.hpp>
 /**
 …
   const double operator*(const VectorContent& b) const;
+  bool operator!=(const VectorContent &other) const {
+    return !(*this == other);
+  }
+private:
+  VectorContent();
+  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<VectorDimension>(*this);
+    ar & content->size;
+    ar & content->stride;
+    ar & boost::serialization::make_array<double>(content->data, content->size);
+  }
+  template<class Archive>
+  void load(Archive & ar, const unsigned int version)
+  {
+    ar & boost::serialization::base_object<VectorDimension>(*this);
+    content = gsl_vector_calloc(getDimension());
+    ar & content->size;
+    ASSERT(getDimension() == content->size,
+        "MatrixContent::load() - dimension mismatch: "
+        +toString(getDimension())+" != "+toString(content->size)+".");
+    ar & content->stride;
+    ar & boost::serialization::make_array<double>(content->data, content->size);
+    // this is always a copy, hence always free
+    free_content_on_exit = true;
+  }
+  BOOST_SERIALIZATION_SPLIT_MEMBER()
+public:
   gsl_vector *content;
 private:
   bool free_content_on_exit;
 };
+//BOOST_CLASS_EXPORT_GUID(VectorContent, "VectorContent")
 std::ostream & operator << (std::ostream& ost, const VectorContent &m);

LinearAlgebra/src/unittests/Makefile.am

-              rc5038e
+              r29cbe9
 AM_LDFLAGS = ${CodePatterns_LIBS} $(CPPUNIT_LIBS) -ldl
 AM_CPPFLAGS = $(CPPUNIT_CFLAGS) ${CodePatterns_CFLAGS}
+AM_CPPFLAGS = $(CPPUNIT_CFLAGS) $(BOOST_CPPFLAGS) ${CodePatterns_CFLAGS}
 TESTS = \
 …
         MatrixContentUnitTest.cpp \
         MatrixContentUnitTest.hpp
+MatrixContentUnitTest_LDADD = ${GSLLIBS}
+MatrixContentUnitTest_LDADD = ${GSLLIBS} \
+        $(BOOST_SERIALIZATION_LDFLAGS) $(BOOST_SERIALIZATION_LIBS)
 PlaneUnitTest_SOURCES = UnitTestMain.cpp \
 …
         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

-              rc5038e
+              r29cbe9
 #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"
 …
+  }
+}
+/** 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

-              rc5038e
+              r29cbe9
     CPPUNIT_TEST (ReadWriteTest );
     CPPUNIT_TEST (SVDTest );
+    CPPUNIT_TEST (SerializationTest );
     CPPUNIT_TEST_SUITE_END();
 …
     void ReadWriteTest();
     void SVDTest();
+    void SerializationTest();
 private:

LinearAlgebra/src/unittests/VectorContentUnitTest.cpp

-              rc5038e
+              r29cbe9
 #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"
 …
   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

-              rc5038e
+              r29cbe9
     CPPUNIT_TEST (OperatorIsTest );
     CPPUNIT_TEST (ReadWriteTest );
+    CPPUNIT_TEST (SerializationTest );
     CPPUNIT_TEST_SUITE_END();
 …
     void OperatorAlgebraTest();
     void ReadWriteTest();
+    void SerializationTest();
 private:

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 29cbe9

Legend:

Download in other formats: