Merge pull request #707 from UWB-Biocomputing/issue-706-cereal-version-model

Moved Versioning Info from Base Classes to Model Class

Author: d-kamath

Simulator/Connections/Connections.h

@@ -74,7 +74,7 @@ class Connections {
    virtual bool updateConnections(AllVertices &vertices);
 
    ///  Cereal serialization method
-   template <class Archive> void serialize(Archive &archive, std::uint32_t const version);
+   template <class Archive> void serialize(Archive &archive);
 
 #if defined(USE_GPU)
 public:
@@ -107,10 +107,8 @@ class Connections {
    log4cplus::Logger edgeLogger_;
 };
 
-CEREAL_CLASS_VERSION(Connections, 1);
-
 ///  Cereal serialization method
-template <class Archive> void Connections::serialize(Archive &archive, std::uint32_t const version)
+template <class Archive> void Connections::serialize(Archive &archive)
 {
    archive(cereal::make_nvp("edges", edges_),
            cereal::make_nvp("synapseIndexMap", synapseIndexMap_));

Simulator/Core/Model.h

@@ -82,7 +82,7 @@ class Model {
    virtual void updateConnections() = 0;
 
    ///  Cereal serialization method
-   template <class Archive> void serialize(Archive &archive);
+   template <class Archive> void serialize(Archive &archive, std::uint32_t const version);
 
 protected:
    // Note: This method was previously used for debugging, but it is now dead code left behind.
@@ -111,10 +111,10 @@ class Model {
       createAllVertices();   /// Populate an instance of AllVertices with an initial state for each vertex.
 };
 
-CEREAL_REGISTER_TYPE(Model);
+CEREAL_CLASS_VERSION(Model, 1);
 
 ///  Cereal serialization method
-template <class Archive> void Model::serialize(Archive &archive)
+template <class Archive> void Model::serialize(Archive &archive, std::uint32_t const version)
 {
    archive(cereal::make_nvp("connections", connections_), cereal::make_nvp("layout", layout_));
 }

Simulator/Edges/AllEdges.h

@@ -59,7 +59,7 @@ class AllEdges {
    virtual void createEdgeIndexMap(EdgeIndexMap &edgeIndexMap);
 
    ///  Cereal serialization method
-   template <class Archive> void serialize(Archive &archive, std::uint32_t const version);
+   template <class Archive> void serialize(Archive &archive);
 
 protected:
    ///  Setup the internal structure of the class (allocate memories and initialize them).
@@ -223,11 +223,9 @@ class AllEdges {
    int countVertices_;
 };
 
-CEREAL_CLASS_VERSION(AllEdges, 1);
-
 ///  Cereal serialization method
 ///  (Serializes edge weights, source vertices, and destination vertices)
-template <class Archive> void AllEdges::serialize(Archive &archive, std::uint32_t const version)
+template <class Archive> void AllEdges::serialize(Archive &archive)
 {
    // serialization
    archive(cereal::make_nvp("sourceVertexIndex", sourceVertexIndex_),

Simulator/Layouts/Layout.h

@@ -85,7 +85,7 @@ class Layout {
    BGSIZE numEndogenouslyActiveNeurons_;   ///< Number of endogenously active neurons.
 
    ///  Cereal serialization method
-   template <class Archive> void serialize(Archive &archive, std::uint32_t const version);
+   template <class Archive> void serialize(Archive &archive);
 
 protected:
    unique_ptr<AllVertices> vertices_;
@@ -95,10 +95,8 @@ class Layout {
    int numVertices_;   ///< Total number of vertices in the graph.
 };
 
-CEREAL_CLASS_VERSION(Layout, 1);
-
 ///  Cereal serialization method
-template <class Archive> void Layout::serialize(Archive &archive, std::uint32_t const version)
+template <class Archive> void Layout::serialize(Archive &archive)
 {
    archive(cereal::make_nvp("xloc", xloc_), cereal::make_nvp("yloc", yloc_),
            cereal::make_nvp("dist2", dist2_), cereal::make_nvp("dist", dist_),

Simulator/Vertices/AllVertices.h

@@ -86,7 +86,7 @@ class AllVertices {
    virtual void registerHistoryVariables() = 0;
 
    ///  Cereal serialization method
-   template <class Archive> void serialize(Archive &archive, std::uint32_t const version);
+   template <class Archive> void serialize(Archive &archive);
 
 protected:
    ///  Total number of vertices.
@@ -158,9 +158,7 @@ struct AllVerticesDeviceProperties {
 };
 #endif   // defined(USE_GPU)
 
-CEREAL_CLASS_VERSION(AllVertices, 1);
-
-template <class Archive> void AllVertices::serialize(Archive &archive, std::uint32_t const version)
+template <class Archive> void AllVertices::serialize(Archive &archive)
 {
    archive(cereal::make_nvp("summationPoints", summationPoints_), cereal::make_nvp("size", size_));
 }