remove vertices parameter from updateConnections

Author: Vanessa Arndorfer

Simulator/Connections/Connections.cpp

@@ -81,9 +81,8 @@ void Connections::createEdgeIndexMap()
 
 ///  Update the connections status in every epoch.
 ///
-///  @param  vertices  The vertex list to search from.
 ///  @return true if successful, false otherwise.
-bool Connections::updateConnections(AllVertices &vertices)
+bool Connections::updateConnections()
 {
    return false;
 }

Simulator/Connections/Connections.h

@@ -67,9 +67,8 @@ class Connections {
 
    ///  Update the connections status in every epoch.
    ///
-   ///  @param  vertices  The vertex list to search from.
    ///  @return true if successful, false otherwise.
-   virtual bool updateConnections(AllVertices &vertices);
+   virtual bool updateConnections();
 
    ///  Cereal serialization method
    template <class Archive> void serialize(Archive &archive);

Simulator/Connections/NG911/Connections911.cpp

@@ -63,7 +63,7 @@ void Connections911::printParameters() const
 
 #if !defined(USE_GPU)
 ///  Update the connections status in every epoch.
-bool Connections911::updateConnections(AllVertices &vertices)
+bool Connections911::updateConnections()
 {
    // Only run on the first epoch
    if (Simulator::getInstance().getCurrentStep() != 1) {
@@ -73,6 +73,7 @@ bool Connections911::updateConnections(AllVertices &vertices)
    // Record old type map
    int numVertices = Simulator::getInstance().getTotalVertices();
    Layout &layout = Simulator::getInstance().getModel().getLayout();
+   AllVertices &vertices = layout.getVertices();
    oldTypeMap_ = layout.vertexTypeMap_;
 
    // Erase PSAPs

Simulator/Connections/NG911/Connections911.h

@@ -72,9 +72,8 @@ class Connections911 : public Connections {
    ///  Update the connections status in every epoch.
    ///  Uses the parent definition for USE_GPU
    ///
-   ///  @param  vertices The Vertex list to search from.
    ///  @return true if successful, false otherwise.
-   virtual bool updateConnections(AllVertices &vertices) override;
+   virtual bool updateConnections() override;
 
    /// Finds the outgoing edge from the given vertex to the Responder closest to
    /// the emergency call location

Simulator/Connections/Neuro/ConnGrowth.cpp

@@ -126,10 +126,12 @@ void ConnGrowth::printParameters() const
 
 ///  Update the connections status in every epoch.
 ///
-///  @param  vertices  The vertex list to search from.
 ///  @return true if successful, false otherwise.
-bool ConnGrowth::updateConnections(AllVertices &vertices)
+bool ConnGrowth::updateConnections()
 {
+   Layout &layout = Simulator::getInstance().getModel().getLayout();
+   AllVertices &vertices = layout.getVertices();
+
    // Update Connections data
    updateConns(vertices);
 

Simulator/Connections/Neuro/ConnGrowth.h

@@ -103,9 +103,8 @@ class ConnGrowth : public Connections {
 
    ///  Update the connections status in every epoch.
    ///
-   ///  @param  vertices  The vertex list to search from.
    ///  @return true if successful, false otherwise.
-   virtual bool updateConnections(AllVertices &vertices) override;
+   virtual bool updateConnections() override;
 
    ///  Cereal serialization method
    template <class Archive> void serialize(Archive &archive);

Simulator/Connections/Neuro/ConnStatic.cpp

@@ -90,11 +90,10 @@ void ConnStatic::printParameters() const
 {
 }
 
-///  Update the connections status in every epoch.
+///  Output the weights matrix after every epoch.
 ///
-///  @param  vertices  The vertex list to search from.
 ///  @return true if successful, false otherwise.
-bool ConnStatic::updateConnections(AllVertices &vertices)
+bool ConnStatic::updateConnections()
 {
    AllNeuroEdges &synapses = dynamic_cast<AllNeuroEdges &>(*edges_);
    synapses.outputWeights(Simulator::getInstance().getCurrentStep());

Simulator/Connections/Neuro/ConnStatic.h

@@ -80,11 +80,10 @@ class ConnStatic : public Connections {
       return destVertexIndexCurrentEpoch_;
    }
 
-   ///  Update the connections status in every epoch.
+   ///  Output the weights matrix after every epoch.
    ///
-   ///  @param  vertices  The vertex list to search from.
    ///  @return true if successful, false otherwise.
-   virtual bool updateConnections(AllVertices &vertices) override;
+   virtual bool updateConnections() override;
 
    ///  Cereal serialization method
    template <class Archive> void serialize(Archive &archive);

Simulator/Core/CPUModel.cpp

@@ -35,7 +35,7 @@ void CPUModel::advance()
 void CPUModel::updateConnections()
 {
    // Update Connections data
-   if (connections_->updateConnections(layout_->getVertices())) {
+   if (connections_->updateConnections()) {
       connections_->updateEdgesWeights();
       // create edge inverse map
       connections_->createEdgeIndexMap();

Simulator/Edges/Neuro/AllSpikingSynapses.cpp

@@ -389,5 +389,5 @@ void AllSpikingSynapses::outputWeights(int epochNum)
    outFile << "</Graph>";
    outFile.close();
 
-   cout << "Success: XML written to " << filename << endl;
+   cout << "Weights matrix output to: " << filename << endl;
 }