[issue-722] Fix default recorder variable setup

Contributors.md

@@ -92,12 +92,9 @@ Lawrence Scott
 Star Wong
 
 ## 2026
-<<<<<<< HEAD
 Likitha Nanduri
-=======
 Dhruva Pyapali
 
->>>>>>> origin/SharedDevelopment
 
 <!-- ---------------------------------------------------------------------------------- -->
 # Graduate

Simulator/Connections/Neuro/ConnGrowth.cpp

@@ -333,4 +333,9 @@ void ConnGrowth::printRadii() const
 
 void ConnGrowth::registerHistoryVariables()
 {
-}
+   Recorder &recorder = Simulator::getInstance().getModel().getRecorder();
+   recorder.registerVariable("radii", radii_, Recorder::UpdatedType::DYNAMIC);
+   recorder.registerVariable("rates", rates_, Recorder::UpdatedType::DYNAMIC);
+   recorder.registerVariable("outgrowth", outgrowth_, Recorder::UpdatedType::DYNAMIC);
+   recorder.registerVariable("deltaR", deltaR_, Recorder::UpdatedType::DYNAMIC);
+}

Simulator/Connections/Neuro/ConnStatic.cpp

@@ -93,11 +93,31 @@ void ConnStatic::printParameters() const
 void ConnStatic::registerHistoryVariables()
 {
    // Register the following variables to be recorded
-   // Note: There may be potential duplicate weight, source, destination vertices
    Recorder &recorder = Simulator::getInstance().getModel().getRecorder();
    recorder.registerVariable("weight", WCurrentEpoch_, Recorder::UpdatedType::DYNAMIC);
    recorder.registerVariable("sourceVertex", sourceVertexIndexCurrentEpoch_,
                              Recorder::UpdatedType::DYNAMIC);
    recorder.registerVariable("destinationVertex", destVertexIndexCurrentEpoch_,
                              Recorder::UpdatedType::DYNAMIC);
 }
+
+bool ConnStatic::updateConnections()
+{
+   AllEdges &edges = getEdges();
+   const vector<unsigned char> &inUse = edges.getInUse();
+   const vector<BGFLOAT> &weights = edges.getWeights();
+   const vector<int> &sourceVertices = edges.getSourceVertexIndices();
+   const vector<int> &destVertices = edges.getDestVertexIndices();
+
+   // Copy one value per active edge into parallel recorder vectors.
+   // weight/source/destination entries at the same index describe the same edge.
+   for (BGSIZE iEdg = 0; iEdg < inUse.size(); iEdg++) {
+      if (inUse[iEdg]) {
+         WCurrentEpoch_.push_back(weights[iEdg]);
+         sourceVertexIndexCurrentEpoch_.push_back(sourceVertices[iEdg]);
+         destVertexIndexCurrentEpoch_.push_back(destVertices[iEdg]);
+      }
+   }
+
+   return false;
+}

Simulator/Connections/Neuro/ConnStatic.h

@@ -64,6 +64,9 @@ class ConnStatic : public Connections {
    /// Registers history variables for recording during simulation
    virtual void registerHistoryVariables() override;
 
+   /// Populates edge history variables for recording during the current epoch.
+   virtual bool updateConnections() override;
+
    /// Get array of vertex weights
    const vector<BGFLOAT> &getWCurrentEpoch() const
    {

Simulator/Edges/AllEdges.h

@@ -59,6 +59,30 @@ class AllEdges {
    ///  Populate a edge index map.
    virtual void createEdgeIndexMap(EdgeIndexMap &edgeIndexMap);
 
+   /// Get array of source vertex indices.
+   const vector<int> &getSourceVertexIndices() const
+   {
+      return sourceVertexIndex_;
+   }
+
+   /// Get array of destination vertex indices.
+   const vector<int> &getDestVertexIndices() const
+   {
+      return destVertexIndex_;
+   }
+
+   /// Get array of edge weights.
+   const vector<BGFLOAT> &getWeights() const
+   {
+      return W_;
+   }
+
+   /// Get array of active edge flags.
+   const vector<unsigned char> &getInUse() const
+   {
+      return inUse_;
+   }
+
    ///  Cereal serialization method
    template <class Archive> void serialize(Archive &archive);
 
@@ -253,4 +277,4 @@ template <class Archive> void AllEdges::serialize(Archive &archive)
            cereal::make_nvp("totalEdgeCount", totalEdgeCount_),
            cereal::make_nvp("maxEdgesPerVertex", maxEdgesPerVertex_),
            cereal::make_nvp("countVertices", countVertices_));
-}
+}

Simulator/Layouts/NG911/Layout911.cpp

@@ -46,16 +46,23 @@ void Layout911::setup()
    // so we call its method first
    Layout::setup();
 
+   // xloc_ and yloc_ remain the layout coordinate storage.
    xloc_.assign(numVertices_, 0);
    yloc_.assign(numVertices_, 0);
 
-   // Loop over all vertices and set their x and y locations
+   // Size recorder mirrors to one initialized value per vertex.
+   xlocRecorder_.assign(numVertices_, 0);
+   ylocRecorder_.assign(numVertices_, 0);
+
+   // Populate layout coordinates and recorder mirrors from GraphML.
    GraphManager<NG911VertexProperties>::VertexIterator vi, vi_end;
    GraphManager<NG911VertexProperties> &gm = GraphManager<NG911VertexProperties>::getInstance();
    for (boost::tie(vi, vi_end) = gm.vertices(); vi != vi_end; ++vi) {
       assert(*vi < numVertices_);
       xloc_[*vi] = gm[*vi].x;
       yloc_[*vi] = gm[*vi].y;
+      xlocRecorder_[*vi] = gm[*vi].x;
+      ylocRecorder_[*vi] = gm[*vi].y;
    }
 
    // Now we cache the between each pair of vertices distances^2 into a matrix
@@ -79,6 +86,19 @@ void Layout911::printParameters() const
 {
 }
 
+void Layout911::registerHistoryVariables()
+{
+   Layout::registerHistoryVariables();
+
+   // Register GraphML coordinates as CONSTANT recorder output.
+   Recorder &recorder = Simulator::getInstance().getModel().getRecorder();
+   string baseName = "Location";
+   string xLocation = "x_" + baseName;
+   string yLocation = "y_" + baseName;
+   recorder.registerVariable(xLocation, xlocRecorder_, Recorder::UpdatedType::CONSTANT);
+   recorder.registerVariable(yLocation, ylocRecorder_, Recorder::UpdatedType::CONSTANT);
+}
+
 // Creates a vertex type map.
 void Layout911::generateVertexTypeMap()
 {

Simulator/Layouts/NG911/Layout911.h

@@ -65,6 +65,9 @@ class Layout911 : public Layout {
    /// Registered to OperationManager as Operation::printParameters
    virtual void printParameters() const override;
 
+   /// Registers history variables for recording during simulation.
+   virtual void registerHistoryVariables() override;
+
    /// Creates a vertex type map.
    ///
    /// @param  numVertices number of the vertices to have in the type map.
@@ -91,6 +94,10 @@ class Layout911 : public Layout {
    vector<int> psapVertexList_;
    vector<int> responderVertexList_;
 
-   DeviceVector<BGFLOAT> xloc_;
-   DeviceVector<BGFLOAT> yloc_;
+   DeviceVector<BGFLOAT> xloc_;   ///< Layout x coordinates.
+   DeviceVector<BGFLOAT> yloc_;   ///< Layout y coordinates.
+
+   /// Recorder mirrors; DeviceVector cannot be registered directly.
+   RecordableVector<BGFLOAT> xlocRecorder_;
+   RecordableVector<BGFLOAT> ylocRecorder_;
 };