Merge branch 'issue-692-move-registerSpikeHistoryVariable' of https://github.com/UWB-Biocomputing/Graphitti into issue-697-update-serializer-class

Author: Divya Kamath

Simulator/Core/Core.cpp

@@ -190,6 +190,9 @@ int Core::runSimulation(string executableName, string cmdLineArguments)
       }
    }
 
+   // Helper function for recorder to register spike history variables for all neurons.
+   simulator.getModel().getLayout().getVertices().registerHistoryVariables();
+
    // Run simulation
    LOG4CPLUS_TRACE(consoleLogger, "Starting Simulation");
    simulator.simulate();

Simulator/Vertices/AllVertices.h

@@ -80,6 +80,11 @@ class AllVertices {
    ///  summation points to their Vm and resets the summation points to zero
    vector<BGFLOAT> summationPoints_;
 
+   /// Helper function for recorder to register spike history variables for all neurons.
+   /// Option 1: Register neuron information in vertexEvents_ one by one.
+   /// Option 2: Register a vector of EventBuffer variables.
+   virtual void registerHistoryVariables() = 0;
+
    ///  Cereal serialization method
    template <class Archive> void serialize(Archive &archive, std::uint32_t const version);
 

Simulator/Vertices/NG911/All911Vertices.h

@@ -120,6 +120,11 @@ class All911Vertices : public AllVertices {
    /// endStep (exclusive)
    virtual void loadEpochInputs(uint64_t currentStep, uint64_t endStep) override;
 
+   /// unused virtual function placeholder
+   virtual void registerHistoryVariables() override
+   {
+   }
+
    /// Accessor for the waiting queue of a vertex
    ///
    /// @param vIdx   The index of the vertex

Simulator/Vertices/Neuro/AllSpikingNeurons.cpp

@@ -20,15 +20,12 @@ void AllSpikingNeurons::setupVertices()
 
    hasFired_.assign(size_, false);
    vertexEvents_.assign(size_, maxSpikes);
-
-   // Register spike history variables
-   registerSpikeHistoryVariables();
 }
 
 ///  Register spike history variables for all neurons.
 ///  Option 1: Register neuron information in vertexEvents_ one by one.
 ///  Option 2: Register a vector of EventBuffer variables.
-void AllSpikingNeurons::registerSpikeHistoryVariables()
+void AllSpikingNeurons::registerHistoryVariables()
 {
    Recorder &recorder = Simulator::getInstance().getModel().getRecorder();
    string baseName = "Neuron_";

Simulator/Vertices/Neuro/AllSpikingNeurons.h

@@ -47,6 +47,11 @@ class AllSpikingNeurons : public AllVertices {
    ///  Clear the spike counts out of all Neurons.
    void clearSpikeCounts();
 
+   /// Helper function for recorder to register spike history variables for all neurons.
+   /// Option 1: Register neuron information in vertexEvents_ one by one.
+   /// Option 2: Register a vector of EventBuffer variables.
+   virtual void registerHistoryVariables() override;
+
    ///  Cereal serialization method
    template <class Archive> void serialize(Archive &archive);
 
@@ -112,12 +117,6 @@ class AllSpikingNeurons : public AllVertices {
    ///  True if back propagation is allowed.
    ///  (parameters used for advanceVerticesDevice.)
    bool fAllowBackPropagation_;
-
-   /// helper for recorder register variables in setupVertices()
-   /// Register spike history variables for all neurons.
-   /// Option 1: Register neuron information in vertexEvents_ one by one.
-   /// Option 2: Register a vector of EventBuffer variables.
-   void registerSpikeHistoryVariables();
 };
 
 // TODO: move this into EventBuffer.h. Well, hasFired_ and inherited members have to stay somehow.