Merge branch 'issue-694-rename-serialize-variables' of https://github.com/UWB-Biocomputing/Graphitti into issue-697-update-serializer-class

Divya Kamath · Divya Kamath · commit b22b1477bba6 · 2024-08-29T11:39:31.000-07:00
diff --git a/Simulator/Connections/Connections.h b/Simulator/Connections/Connections.h
@@ -115,6 +115,6 @@ CEREAL_CLASS_VERSION(Connections, 1);
 ///  Cereal serialization method
 template <class Archive> void Connections::serialize(Archive &archive, std::uint32_t const version)
 {
-   archive(cereal::make_nvp("edges_", edges_),
-           cereal::make_nvp("synapseIndexMap_", synapseIndexMap_));
+   archive(cereal::make_nvp("edges", edges_),
+           cereal::make_nvp("synapseIndexMap", synapseIndexMap_));
 }
diff --git a/Simulator/Connections/Neuro/ConnGrowth.h b/Simulator/Connections/Neuro/ConnGrowth.h
@@ -204,8 +204,8 @@ CEREAL_REGISTER_TYPE(ConnGrowth);   // to enable polymorphism
 template <class Archive> void ConnGrowth::serialize(Archive &archive)
 {
    archive(cereal::base_class<Connections>(this), cereal::make_nvp("radiiSize", radiiSize_),
-           cereal::make_nvp("growthParams_", growthParams_), cereal::make_nvp("W_", W_),
-           cereal::make_nvp("radii_", radii_), cereal::make_nvp("rates_", rates_),
-           cereal::make_nvp("area_", area_), cereal::make_nvp("outgrowth_", outgrowth_),
-           cereal::make_nvp("deltaR_", deltaR_));
+           cereal::make_nvp("growthParams", growthParams_), cereal::make_nvp("W", W_),
+           cereal::make_nvp("radii", radii_), cereal::make_nvp("rates", rates_),
+           cereal::make_nvp("delta", delta_), cereal::make_nvp("area", area_),
+           cereal::make_nvp("outgrowth", outgrowth_), cereal::make_nvp("deltaR", deltaR_));
 }
diff --git a/Simulator/Connections/Neuro/ConnStatic.h b/Simulator/Connections/Neuro/ConnStatic.h
@@ -137,12 +137,12 @@ CEREAL_REGISTER_TYPE(ConnStatic);
 template <class Archive> void ConnStatic::serialize(Archive &archive)
 {
    archive(cereal::base_class<Connections>(this),
-           cereal::make_nvp("sourceVertexIndexCurrentEpoch_", sourceVertexIndexCurrentEpoch_),
-           cereal::make_nvp("destVertexIndexCurrentEpoch_", destVertexIndexCurrentEpoch_),
-           cereal::make_nvp("WCurrentEpoch_", WCurrentEpoch_),
-           cereal::make_nvp("radiiSize_", radiiSize_),
-           cereal::make_nvp("connsPerVertex_", connsPerVertex_),
-           cereal::make_nvp("threshConnsRadius_", threshConnsRadius_),
-           cereal::make_nvp("rewiringProbability_", rewiringProbability_),
-           cereal::make_nvp("excWeight_", excWeight_), cereal::make_nvp("inhWeight_", inhWeight_));
-}
+           cereal::make_nvp("sourceVertexIndexCurrentEpoch", sourceVertexIndexCurrentEpoch_),
+           cereal::make_nvp("destVertexIndexCurrentEpoch", destVertexIndexCurrentEpoch_),
+           cereal::make_nvp("WCurrentEpoch", WCurrentEpoch_),
+           cereal::make_nvp("radiiSize", radiiSize_),
+           cereal::make_nvp("connsPerVertex", connsPerVertex_),
+           cereal::make_nvp("threshConnsRadius", threshConnsRadius_),
+           cereal::make_nvp("rewiringProbability", rewiringProbability_),
+           cereal::make_nvp("excWeight", excWeight_), cereal::make_nvp("inhWeight", inhWeight_));
+}
diff --git a/Simulator/Core/EdgeIndexMap.h b/Simulator/Core/EdgeIndexMap.h
@@ -111,12 +111,12 @@ struct EdgeIndexMapDevice {
 ///  Cereal serialization method
 template <class Archive> void EdgeIndexMap::serialize(Archive &archive)
 {
-   archive(cereal::make_nvp("outgoingEdgeIndexMap_", outgoingEdgeIndexMap_),
-           cereal::make_nvp("outgoingEdgeBegin_", outgoingEdgeBegin_),
-           cereal::make_nvp("outgoingEdgeCount_", outgoingEdgeCount_),
-           cereal::make_nvp("incomingEdgeIndexMap_", incomingEdgeIndexMap_),
-           cereal::make_nvp("incomingEdgeBegin_", incomingEdgeBegin_),
-           cereal::make_nvp("incomingEdgeCount_", incomingEdgeCount_),
-           cereal::make_nvp("numOfVertices_", numOfVertices_),
-           cereal::make_nvp("numOfEdges_", numOfEdges_));
+   archive(cereal::make_nvp("outgoingEdgeIndexMap", outgoingEdgeIndexMap_),
+           cereal::make_nvp("outgoingEdgeBegin", outgoingEdgeBegin_),
+           cereal::make_nvp("outgoingEdgeCount", outgoingEdgeCount_),
+           cereal::make_nvp("incomingEdgeIndexMap", incomingEdgeIndexMap_),
+           cereal::make_nvp("incomingEdgeBegin", incomingEdgeBegin_),
+           cereal::make_nvp("incomingEdgeCount", incomingEdgeCount_),
+           cereal::make_nvp("numOfVertices", numOfVertices_),
+           cereal::make_nvp("numOfEdges", numOfEdges_));
 }
diff --git a/Simulator/Core/Model.h b/Simulator/Core/Model.h
@@ -20,6 +20,8 @@
 #include "Recorder.h"
 #include <log4cplus/loggingmacros.h>
 #include <memory>
+//cereal
+#include <cereal/types/memory.hpp>
 
 using namespace std;
 
@@ -79,6 +81,9 @@ class Model {
    /// might be similar to advance.
    virtual void updateConnections() = 0;
 
+   ///  Cereal serialization method
+   template <class Archive> void serialize(Archive &archive);
+
 protected:
    // Note: This method was previously used for debugging, but it is now dead code left behind.
    /// Prints debug information about the current state of the network.
@@ -105,3 +110,11 @@ class Model {
    void
       createAllVertices();   /// Populate an instance of AllVertices with an initial state for each vertex.
 };
+
+CEREAL_REGISTER_TYPE(Model);
+
+///  Cereal serialization method
+template <class Archive> void Model::serialize(Archive &archive)
+{
+   archive(cereal::make_nvp("connections", connections_), cereal::make_nvp("layout", layout_));
+}
diff --git a/Simulator/Edges/AllEdges.h b/Simulator/Edges/AllEdges.h
@@ -231,11 +231,11 @@ CEREAL_CLASS_VERSION(AllEdges, 1);
 template <class Archive> void AllEdges::serialize(Archive &archive, std::uint32_t const version)
 {
    // serialization
-   archive(cereal::make_nvp("sourceVertexIndex_", sourceVertexIndex_),
+   archive(cereal::make_nvp("sourceVertexIndex", sourceVertexIndex_),
            cereal::make_nvp("edgeWeights", W_),
-           cereal::make_nvp("destVertexIndex_", destVertexIndex_), cereal::make_nvp("type_", type_),
-           cereal::make_nvp("inUse_", inUse_), cereal::make_nvp("edgeCounts_", edgeCounts_),
-           cereal::make_nvp("totalEdgeCount_", totalEdgeCount_),
-           cereal::make_nvp("maxEdgesPerVertex_", maxEdgesPerVertex_),
-           cereal::make_nvp("countVertices_", countVertices_));
+           cereal::make_nvp("destVertexIndex", destVertexIndex_), cereal::make_nvp("type", type_),
+           cereal::make_nvp("inUse", inUse_), cereal::make_nvp("edgeCounts", edgeCounts_),
+           cereal::make_nvp("totalEdgeCount", totalEdgeCount_),
+           cereal::make_nvp("maxEdgesPerVertex", maxEdgesPerVertex_),
+           cereal::make_nvp("countVertices", countVertices_));
 }
diff --git a/Simulator/Edges/Neuro/AllDSSynapses.h b/Simulator/Edges/Neuro/AllDSSynapses.h
@@ -260,7 +260,7 @@ CEREAL_REGISTER_TYPE(AllDSSynapses);
 ///  Cereal serialization method
 template <class Archive> void AllDSSynapses::serialize(Archive &archive)
 {
-   archive(cereal::base_class<AllSpikingSynapses>(this), cereal::make_nvp("lastSpike_", lastSpike_),
-           cereal::make_nvp("r_", r_), cereal::make_nvp("u_", u_), cereal::make_nvp("D_", D_),
-           cereal::make_nvp("U_", U_), cereal::make_nvp("F_", F_));
+   archive(cereal::base_class<AllSpikingSynapses>(this), cereal::make_nvp("lastSpike", lastSpike_),
+           cereal::make_nvp("r", r_), cereal::make_nvp("u", u_), cereal::make_nvp("D", D_),
+           cereal::make_nvp("U", U_), cereal::make_nvp("F", F_));
 }
diff --git a/Simulator/Edges/Neuro/AllDynamicSTDPSynapses.h b/Simulator/Edges/Neuro/AllDynamicSTDPSynapses.h
@@ -266,7 +266,7 @@ CEREAL_REGISTER_TYPE(AllDynamicSTDPSynapses);
 ///  Cereal serialization method
 template <class Archive> void AllDynamicSTDPSynapses::serialize(Archive &archive)
 {
-   archive(cereal::base_class<AllSTDPSynapses>(this), cereal::make_nvp("lastSpike_", lastSpike_),
-           cereal::make_nvp("r_", r_), cereal::make_nvp("u_", u_), cereal::make_nvp("D_", D_),
-           cereal::make_nvp("U_", U_), cereal::make_nvp("F_", F_));
+   archive(cereal::base_class<AllSTDPSynapses>(this), cereal::make_nvp("lastSpike", lastSpike_),
+           cereal::make_nvp("r", r_), cereal::make_nvp("u", u_), cereal::make_nvp("D", D_),
+           cereal::make_nvp("U", U_), cereal::make_nvp("F", F_));
 }
diff --git a/Simulator/Edges/Neuro/AllNeuroEdges.h b/Simulator/Edges/Neuro/AllNeuroEdges.h
@@ -156,5 +156,5 @@ CEREAL_REGISTER_TYPE(AllNeuroEdges);
 ///  Cereal serialization method
 template <class Archive> void AllNeuroEdges::serialize(Archive &archive)
 {
-   archive(cereal::base_class<AllEdges>(this), cereal::make_nvp("psr_", psr_));
+   archive(cereal::base_class<AllEdges>(this), cereal::make_nvp("psr", psr_));
 }
diff --git a/Simulator/Edges/Neuro/AllSTDPSynapses.h b/Simulator/Edges/Neuro/AllSTDPSynapses.h
@@ -424,21 +424,21 @@ CEREAL_REGISTER_TYPE(AllSTDPSynapses);
 template <class Archive> void AllSTDPSynapses::serialize(Archive &archive)
 {
    archive(cereal::base_class<AllSpikingSynapses>(this),
-           cereal::make_nvp("totalDelayPost_", totalDelayPost_),
-           cereal::make_nvp("delayQueuePost_", delayQueuePost_),
-           cereal::make_nvp("delayIndexPost_", delayIndexPost_),
-           cereal::make_nvp("delayQueuePostLength_", delayQueuePostLength_),
-           cereal::make_nvp("tauspost_", tauspost_), cereal::make_nvp("tauspre_", tauspre_),
-           cereal::make_nvp("taupos_", taupos_), cereal::make_nvp("tauneg_", tauneg_),
-           cereal::make_nvp("STDPgap_", STDPgap_), cereal::make_nvp("Wex_", Wex_),
-           cereal::make_nvp("Aneg_", Aneg_), cereal::make_nvp("Apos_", Apos_),
-           cereal::make_nvp("mupos_", mupos_), cereal::make_nvp("muneg_", muneg_),
-           cereal::make_nvp("defaultSTDPgap_", defaultSTDPgap_),
-           cereal::make_nvp("tauspost_I_", tauspost_I_), cereal::make_nvp("tauspre_I_", tauspre_I_),
-           cereal::make_nvp("tauspost_E_", tauspost_E_), cereal::make_nvp("tauspre_E_", tauspre_E_),
-           cereal::make_nvp("taupos_I_", taupos_I_), cereal::make_nvp("tauneg_I_", tauneg_I_),
-           cereal::make_nvp("taupos_E_", taupos_E_), cereal::make_nvp("tauneg_E_", tauneg_E_),
-           cereal::make_nvp("Wex_I_", Wex_I_), cereal::make_nvp("Wex_E_", Wex_E_),
-           cereal::make_nvp("Aneg_I_", Aneg_I_), cereal::make_nvp("Aneg_E_", Aneg_E_),
-           cereal::make_nvp("Apos_I_", Apos_I_), cereal::make_nvp("Apos_E_", Apos_E_));
+           cereal::make_nvp("totalDelayPost", totalDelayPost_),
+           cereal::make_nvp("delayQueuePost", delayQueuePost_),
+           cereal::make_nvp("delayIndexPost", delayIndexPost_),
+           cereal::make_nvp("delayQueuePostLength", delayQueuePostLength_),
+           cereal::make_nvp("tauspost", tauspost_), cereal::make_nvp("tauspre", tauspre_),
+           cereal::make_nvp("taupos", taupos_), cereal::make_nvp("tauneg", tauneg_),
+           cereal::make_nvp("STDPgap", STDPgap_), cereal::make_nvp("Wex", Wex_),
+           cereal::make_nvp("Aneg", Aneg_), cereal::make_nvp("Apos", Apos_),
+           cereal::make_nvp("mupos", mupos_), cereal::make_nvp("muneg", muneg_),
+           cereal::make_nvp("defaultSTDPgap", defaultSTDPgap_),
+           cereal::make_nvp("tauspost_I", tauspost_I_), cereal::make_nvp("tauspre_I", tauspre_I_),
+           cereal::make_nvp("tauspost_E", tauspost_E_), cereal::make_nvp("tauspre_E", tauspre_E_),
+           cereal::make_nvp("taupos_I", taupos_I_), cereal::make_nvp("tauneg_I", tauneg_I_),
+           cereal::make_nvp("taupos_E", taupos_E_), cereal::make_nvp("tauneg_E", tauneg_E_),
+           cereal::make_nvp("Wex_I", Wex_I_), cereal::make_nvp("Wex_E", Wex_E_),
+           cereal::make_nvp("Aneg_I", Aneg_I_), cereal::make_nvp("Aneg_E", Aneg_E_),
+           cereal::make_nvp("Apos_I", Apos_I_), cereal::make_nvp("Apos_E", Apos_E_));
 }
diff --git a/Simulator/Edges/Neuro/AllSpikingSynapses.h b/Simulator/Edges/Neuro/AllSpikingSynapses.h
@@ -336,13 +336,12 @@ CEREAL_REGISTER_TYPE(AllSpikingSynapses);
 ///  Cereal serialization method
 template <class Archive> void AllSpikingSynapses::serialize(Archive &archive)
 {
-   archive(cereal::base_class<AllNeuroEdges>(this), cereal::make_nvp("decay_", decay_),
-           cereal::make_nvp("tau_", tau_), cereal::make_nvp("tau_II_", tau_II_),
-           cereal::make_nvp("tau_IE_", tau_IE_), cereal::make_nvp("tau_EI_", tau_EI_),
-           cereal::make_nvp("tau_EE_", tau_EE_), cereal::make_nvp("delay_II_", delay_II_),
-           cereal::make_nvp("delay_IE_", delay_IE_), cereal::make_nvp("delay_EI_", delay_EI_),
-           cereal::make_nvp("delay_EE_", delay_EE_), cereal::make_nvp("totalDelay_", totalDelay_),
-           cereal::make_nvp("delayQueue_", delayQueue_),
-           cereal::make_nvp("delayIndex_", delayIndex_),
-           cereal::make_nvp("delayQueueLength_", delayQueueLength_));
+   archive(cereal::base_class<AllNeuroEdges>(this), cereal::make_nvp("decay", decay_),
+           cereal::make_nvp("tau", tau_), cereal::make_nvp("tau_II", tau_II_),
+           cereal::make_nvp("tau_IE", tau_IE_), cereal::make_nvp("tau_EI", tau_EI_),
+           cereal::make_nvp("tau_EE", tau_EE_), cereal::make_nvp("delay_II", delay_II_),
+           cereal::make_nvp("delay_IE", delay_IE_), cereal::make_nvp("delay_EI", delay_EI_),
+           cereal::make_nvp("delay_EE", delay_EE_), cereal::make_nvp("totalDelay", totalDelay_),
+           cereal::make_nvp("delayQueue", delayQueue_), cereal::make_nvp("delayIndex", delayIndex_),
+           cereal::make_nvp("delayQueueLength", delayQueueLength_));
 }
diff --git a/Simulator/Layouts/Neuro/LayoutNeuro.h b/Simulator/Layouts/Neuro/LayoutNeuro.h
@@ -16,6 +16,8 @@
 #pragma once
 
 #include "Layout.h"
+// cereal
+#include <cereal/types/polymorphic.hpp>
 
 using namespace std;
 
@@ -53,4 +55,15 @@ class LayoutNeuro : public Layout {
 
    /// Prints the layout, used for debugging.
    void printLayout();
+
+   ///  Cereal serialization method
+   template <class Archive> void serialize(Archive &archive);
 };
+
+CEREAL_REGISTER_TYPE(LayoutNeuro);
+
+///  Cereal serialization method
+template <class Archive> void LayoutNeuro::serialize(Archive &archive)
+{
+   archive(cereal::base_class<Layout>(this));
+}
diff --git a/Simulator/Recorders/RecordableBase.h b/Simulator/Recorders/RecordableBase.h
@@ -52,12 +52,12 @@ class RecordableBase {
    ///  Cereal serialization method
    template <class Archive> void serialize(Archive &archive)
    {
-      archive(cereal::make_nvp("basicDataType_", basicDataType_));
+      archive(cereal::make_nvp("basicDataType", basicDataType_));
    }
 
 protected:
    /// prevents any code outside this class from creating a RecordableBase object
    RecordableBase() = default;
    /// the basic data type in the recorded variable
    std::string basicDataType_;
-};
+};
diff --git a/Simulator/Recorders/RecordableVector.h b/Simulator/Recorders/RecordableVector.h
@@ -85,7 +85,7 @@ template <typename T> class RecordableVector : public RecordableBase {
    template <class Archive> void serialize(Archive &archive)
    {
       archive(cereal::virtual_base_class<RecordableBase>(this),
-              cereal::make_nvp("dataSeries_", dataSeries_));
+              cereal::make_nvp("dataSeries", dataSeries_));
    }
 
 protected:
diff --git a/Simulator/Vertices/EventBuffer.h b/Simulator/Vertices/EventBuffer.h
@@ -157,7 +157,7 @@ CEREAL_REGISTER_TYPE(EventBuffer);
 template <class Archive> void EventBuffer::serialize(Archive &archive)
 {
    archive(cereal::base_class<RecordableVector<uint64_t>>(this),
-           cereal::make_nvp("bufferFront_", bufferFront_),
-           cereal::make_nvp("bufferEnd_", bufferEnd_), cereal::make_nvp("epochStart_", epochStart_),
-           cereal::make_nvp("numElementsInEpoch_", numElementsInEpoch_));
+           cereal::make_nvp("bufferFront", bufferFront_), cereal::make_nvp("bufferEnd", bufferEnd_),
+           cereal::make_nvp("epochStart", epochStart_),
+           cereal::make_nvp("numElementsInEpoch", numElementsInEpoch_));
 }
diff --git a/Simulator/Vertices/Neuro/AllIFNeurons.h b/Simulator/Vertices/Neuro/AllIFNeurons.h
@@ -304,15 +304,15 @@ CEREAL_REGISTER_TYPE(AllIFNeurons);
 ///  Cereal serialization method
 template <class Archive> void AllIFNeurons::serialize(Archive &archive)
 {
-   archive(cereal::base_class<AllSpikingNeurons>(this), cereal::make_nvp("Trefract_", Trefract_),
-           cereal::make_nvp("Vthresh_", Vthresh_), cereal::make_nvp("Vrest_", Vrest_),
-           cereal::make_nvp("Vreset_", Vreset_), cereal::make_nvp("Vinit_", Vinit_),
-           cereal::make_nvp("Cm_", Cm_), cereal::make_nvp("Rm_", Rm_),
-           cereal::make_nvp("Inoise_", Inoise_), cereal::make_nvp("Iinject_", Iinject_),
-           cereal::make_nvp("Isyn_", Isyn_),
-           cereal::make_nvp("numStepsInRefractoryPeriod_", numStepsInRefractoryPeriod_),
-           cereal::make_nvp("C1_", C1_), cereal::make_nvp("C2_", C2_), cereal::make_nvp("I0_", I0_),
-           cereal::make_nvp("Vm_", Vm_), cereal::make_nvp("Tau_", Tau_));
+   archive(cereal::base_class<AllSpikingNeurons>(this), cereal::make_nvp("Trefract", Trefract_),
+           cereal::make_nvp("Vthresh", Vthresh_), cereal::make_nvp("Vrest", Vrest_),
+           cereal::make_nvp("Vreset", Vreset_), cereal::make_nvp("Vinit", Vinit_),
+           cereal::make_nvp("Cm", Cm_), cereal::make_nvp("Rm", Rm_),
+           cereal::make_nvp("Inoise", Inoise_), cereal::make_nvp("Iinject", Iinject_),
+           cereal::make_nvp("Isyn", Isyn_),
+           cereal::make_nvp("numStepsInRefractoryPeriod", numStepsInRefractoryPeriod_),
+           cereal::make_nvp("C1", C1_), cereal::make_nvp("C2", C2_), cereal::make_nvp("I0", I0_),
+           cereal::make_nvp("Vm", Vm_), cereal::make_nvp("Tau", Tau_));
 
    //Private variables are intentionally excluded from serialization as they are populated from configuration files.
 }
diff --git a/Simulator/Vertices/Neuro/AllIZHNeurons.h b/Simulator/Vertices/Neuro/AllIZHNeurons.h
@@ -327,10 +327,10 @@ CEREAL_REGISTER_TYPE(AllIZHNeurons);
 ///  Cereal serialization method
 template <class Archive> void AllIZHNeurons::serialize(Archive &archive)
 {
-   archive(cereal::base_class<AllIFNeurons>(this), cereal::make_nvp("Aconst_", Aconst_),
-           cereal::make_nvp("Bconst_", Bconst_), cereal::make_nvp("Cconst_", Cconst_),
-           cereal::make_nvp("Dconst_", Dconst_), cereal::make_nvp("u_", u_),
-           cereal::make_nvp("C3_", C3_));
+   archive(cereal::base_class<AllIFNeurons>(this), cereal::make_nvp("Aconst", Aconst_),
+           cereal::make_nvp("Bconst", Bconst_), cereal::make_nvp("Cconst", Cconst_),
+           cereal::make_nvp("Dconst", Dconst_), cereal::make_nvp("u", u_),
+           cereal::make_nvp("C3", C3_));
 
    //Private variables are intentionally excluded from serialization as they are populated from configuration files.
 }
diff --git a/Simulator/Vertices/Neuro/AllSpikingNeurons.h b/Simulator/Vertices/Neuro/AllSpikingNeurons.h
@@ -144,7 +144,7 @@ CEREAL_REGISTER_TYPE(AllSpikingNeurons);
 ///  Cereal serialization method
 template <class Archive> void AllSpikingNeurons::serialize(Archive &archive)
 {
-   archive(cereal::base_class<AllVertices>(this), cereal::make_nvp("hasFired_", hasFired_),
-           cereal::make_nvp("vertexEvents_", vertexEvents_),
-           cereal::make_nvp("fAllowBackPropagation_", fAllowBackPropagation_));
+   archive(cereal::base_class<AllVertices>(this), cereal::make_nvp("hasFired", hasFired_),
+           cereal::make_nvp("vertexEvents", vertexEvents_),
+           cereal::make_nvp("fAllowBackPropagation", fAllowBackPropagation_));
 }

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,6 @@ CEREAL_CLASS_VERSION(Connections, 1);`
`115`	`115`	`/// Cereal serialization method`
`116`	`116`	`template <class Archive> void Connections::serialize(Archive &archive, std::uint32_t const version)`
`117`	`117`	`{`
`118`		`- archive(cereal::make_nvp("edges_", edges_),`
`119`		`- cereal::make_nvp("synapseIndexMap_", synapseIndexMap_));`
	`118`	`+ archive(cereal::make_nvp("edges", edges_),`
	`119`	`+ cereal::make_nvp("synapseIndexMap", synapseIndexMap_));`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,8 @@ CEREAL_REGISTER_TYPE(ConnGrowth); // to enable polymorphism`
`204`	`204`	`template <class Archive> void ConnGrowth::serialize(Archive &archive)`
`205`	`205`	`{`
`206`	`206`	`archive(cereal::base_class<Connections>(this), cereal::make_nvp("radiiSize", radiiSize_),`
`207`		`- cereal::make_nvp("growthParams_", growthParams_), cereal::make_nvp("W_", W_),`
`208`		`- cereal::make_nvp("radii_", radii_), cereal::make_nvp("rates_", rates_),`
`209`		`- cereal::make_nvp("area_", area_), cereal::make_nvp("outgrowth_", outgrowth_),`
`210`		`- cereal::make_nvp("deltaR_", deltaR_));`
	`207`	`+ cereal::make_nvp("growthParams", growthParams_), cereal::make_nvp("W", W_),`
	`208`	`+ cereal::make_nvp("radii", radii_), cereal::make_nvp("rates", rates_),`
	`209`	`+ cereal::make_nvp("delta", delta_), cereal::make_nvp("area", area_),`
	`210`	`+ cereal::make_nvp("outgrowth", outgrowth_), cereal::make_nvp("deltaR", deltaR_));`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ CEREAL_REGISTER_TYPE(AllDSSynapses);`
`260`	`260`	`/// Cereal serialization method`
`261`	`261`	`template <class Archive> void AllDSSynapses::serialize(Archive &archive)`
`262`	`262`	`{`
`263`		`- archive(cereal::base_class<AllSpikingSynapses>(this), cereal::make_nvp("lastSpike_", lastSpike_),`
`264`		`- cereal::make_nvp("r_", r_), cereal::make_nvp("u_", u_), cereal::make_nvp("D_", D_),`
`265`		`- cereal::make_nvp("U_", U_), cereal::make_nvp("F_", F_));`
	`263`	`+ archive(cereal::base_class<AllSpikingSynapses>(this), cereal::make_nvp("lastSpike", lastSpike_),`
	`264`	`+ cereal::make_nvp("r", r_), cereal::make_nvp("u", u_), cereal::make_nvp("D", D_),`
	`265`	`+ cereal::make_nvp("U", U_), cereal::make_nvp("F", F_));`
`266`	`266`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ CEREAL_REGISTER_TYPE(AllDynamicSTDPSynapses);`
`266`	`266`	`/// Cereal serialization method`
`267`	`267`	`template <class Archive> void AllDynamicSTDPSynapses::serialize(Archive &archive)`
`268`	`268`	`{`
`269`		`- archive(cereal::base_class<AllSTDPSynapses>(this), cereal::make_nvp("lastSpike_", lastSpike_),`
`270`		`- cereal::make_nvp("r_", r_), cereal::make_nvp("u_", u_), cereal::make_nvp("D_", D_),`
`271`		`- cereal::make_nvp("U_", U_), cereal::make_nvp("F_", F_));`
	`269`	`+ archive(cereal::base_class<AllSTDPSynapses>(this), cereal::make_nvp("lastSpike", lastSpike_),`
	`270`	`+ cereal::make_nvp("r", r_), cereal::make_nvp("u", u_), cereal::make_nvp("D", D_),`
	`271`	`+ cereal::make_nvp("U", U_), cereal::make_nvp("F", F_));`
`272`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,5 +156,5 @@ CEREAL_REGISTER_TYPE(AllNeuroEdges);`
`156`	`156`	`/// Cereal serialization method`
`157`	`157`	`template <class Archive> void AllNeuroEdges::serialize(Archive &archive)`
`158`	`158`	`{`
`159`		`- archive(cereal::base_class<AllEdges>(this), cereal::make_nvp("psr_", psr_));`
	`159`	`+ archive(cereal::base_class<AllEdges>(this), cereal::make_nvp("psr", psr_));`
`160`	`160`	`}`