Merge pull request #546 from UWB-Biocomputing/issue-515-remove-const-parameters-primitive

Remove 'const' qualifiers for primitive datatypes

Author: d-kamath

Simulator/Connections/Connections.cpp

@@ -89,8 +89,7 @@ bool Connections::updateConnections(AllVertices &vertices)
 }
 
 #if defined(USE_GPU)
-void Connections::updateSynapsesWeights(const int numVertices, AllVertices &vertices,
-                                        AllEdges &synapses,
+void Connections::updateSynapsesWeights(int numVertices, AllVertices &vertices, AllEdges &synapses,
                                         AllSpikingNeuronsDeviceProperties *allVerticesDevice,
                                         AllSpikingSynapsesDeviceProperties *allEdgesDevice,
                                         Layout &layout)

Simulator/Connections/Connections.h

@@ -85,8 +85,7 @@ class Connections {
    ///  @param  allVerticesDevice    GPU address of the allVertices struct on device memory.
    ///  @param  allEdgesDevice   GPU address of the allEdges struct on device memory.
    ///  @param  layout              Layout information of the neural network.
-   virtual void updateSynapsesWeights(const int numVertices, AllVertices &vertices,
-                                      AllEdges &synapses,
+   virtual void updateSynapsesWeights(int numVertices, AllVertices &vertices, AllEdges &synapses,
                                       AllSpikingNeuronsDeviceProperties *allVerticesDevice,
                                       AllSpikingSynapsesDeviceProperties *allEdgesDevice,
                                       Layout &layout);

Simulator/Connections/Neuro/ConnGrowth.h

@@ -130,8 +130,7 @@ class ConnGrowth : public Connections {
    ///  @param  allVerticesDevice    GPU address of the AllVertices struct in device memory.
    ///  @param  allEdgesDevice       GPU address of the AllEdges struct in device memory.
    ///  @param  layout               The Layout object.
-   virtual void updateSynapsesWeights(const int numVertices, AllVertices &neurons,
-                                      AllEdges &synapses,
+   virtual void updateSynapsesWeights(int numVertices, AllVertices &neurons, AllEdges &synapses,
                                       AllSpikingNeuronsDeviceProperties *allVerticesDevice,
                                       AllSpikingSynapsesDeviceProperties *allEdgesDevice,
                                       Layout &layout) override;

Simulator/Connections/Neuro/ConnGrowth_d.cpp

@@ -26,8 +26,7 @@
  *  @param  allEdgesDevice      GPU address to the AllEdges struct in device memory.
  *  @param  layout              The Layout object.
  */
-void ConnGrowth::updateSynapsesWeights(const int numVertices, AllVertices &vertices,
-                                       AllEdges &synapses,
+void ConnGrowth::updateSynapsesWeights(int numVertices, AllVertices &vertices, AllEdges &synapses,
                                        AllSpikingNeuronsDeviceProperties *allVerticesDevice,
                                        AllSpikingSynapsesDeviceProperties *allEdgesDevice,
                                        Layout &layout)

Simulator/Core/GPUModel.h

@@ -141,15 +141,15 @@ class GPUModel : public Model {
    void updateHistory();
 
    // TODO
-   void eraseEdge(AllEdges &synapses, const int neuronIndex, const int synapseIndex);
+   void eraseEdge(AllEdges &synapses, int neuronIndex, int synapseIndex);
 
    // TODO
-   void addEdge(AllEdges &synapses, edgeType type, const int srcVertex, const int destVertex,
+   void addEdge(AllEdges &synapses, edgeType type, int srcVertex, int destVertex,
                 Coordinate &source, Coordinate &dest, BGFLOAT deltaT);
 
    // TODO
-   void createEdge(AllEdges &synapses, const int neuronIndex, const int synapseIndex,
-                   Coordinate source, Coordinate dest, BGFLOAT deltaT, edgeType type);
+   void createEdge(AllEdges &synapses, int neuronIndex, int synapseIndex, Coordinate source,
+                   Coordinate dest, BGFLOAT deltaT, edgeType type);
 };
 
 #if defined(__CUDACC__)

Simulator/Core/Simulator.cpp

@@ -191,7 +191,7 @@ void Simulator::simulate()
 /// Helper for #simulate(). Advance simulation until ready for next growth cycle.
 /// This should simulate all neuron and synapse activity for one epoch.
 /// @param currentStep the current epoch in which the network is being simulated.
-void Simulator::advanceEpoch(const int &currentEpoch) const
+void Simulator::advanceEpoch(int currentEpoch) const
 {
    uint64_t count = 0;
    // Compute step number at end of this simulation epoch

Simulator/Core/Simulator.h

@@ -47,8 +47,8 @@ class Simulator {
 
    void simulate();
 
-   void advanceEpoch(const int &currentEpoch) const;   /// Advance simulation to next growth
-                                                       /// cycle. Helper for #simulate().
+   void advanceEpoch(int currentEpoch) const;   /// Advance simulation to next growth
+                                                /// cycle. Helper for #simulate().
 
    void saveResults() const;   /// Writes simulation results to an output destination.
 

Simulator/Edges/AllEdges.cpp

@@ -30,7 +30,7 @@ AllEdges::AllEdges() : totalEdgeCount_(0), maxEdgesPerVertex_(0), countVertices_
    edgeLogger_ = log4cplus::Logger::getInstance(LOG4CPLUS_TEXT("edge"));
 }
 
-AllEdges::AllEdges(const int numVertices, const int maxEdges)
+AllEdges::AllEdges(int numVertices, int maxEdges)
 {
    setupEdges(numVertices, maxEdges);
 }
@@ -66,7 +66,7 @@ void AllEdges::setupEdges()
 ///
 ///  @param  numVertices   Total number of vertices in the network.
 ///  @param  maxEdges  Maximum number of edges per vertex.
-void AllEdges::setupEdges(const int numVertices, const int maxEdges)
+void AllEdges::setupEdges(int numVertices, int maxEdges)
 {
    BGSIZE maxTotalEdges = maxEdges * numVertices;
 
@@ -90,7 +90,7 @@ void AllEdges::setupEdges(const int numVertices, const int maxEdges)
 ///
 ///  @param  input  istream to read from.
 ///  @param  iEdg   Index of the edge to set.
-void AllEdges::readEdge(istream &input, const BGSIZE iEdg)
+void AllEdges::readEdge(istream &input, BGSIZE iEdg)
 {
    int synapse_type(0);
 
@@ -113,7 +113,7 @@ void AllEdges::readEdge(istream &input, const BGSIZE iEdg)
 ///
 ///  @param  output  stream to print out to.
 ///  @param  iEdg    Index of the edge to print out.
-void AllEdges::writeEdge(ostream &output, const BGSIZE iEdg) const
+void AllEdges::writeEdge(ostream &output, BGSIZE iEdg) const
 {
    output << sourceVertexIndex_[iEdg] << ends;
    output << destVertexIndex_[iEdg] << ends;
@@ -126,7 +126,7 @@ void AllEdges::writeEdge(ostream &output, const BGSIZE iEdg) const
 ///
 ///  @param  typeOrdinal    Integer that correspond with a edgeType.
 ///  @return the SynapseType that corresponds with the given integer.
-edgeType AllEdges::edgeOrdinalToType(const int typeOrdinal)
+edgeType AllEdges::edgeOrdinalToType(int typeOrdinal)
 {
    switch (typeOrdinal) {
       case 0:
@@ -238,7 +238,7 @@ void AllEdges::advanceEdges(AllVertices &vertices, EdgeIndexMap &edgeIndexMap)
 ///
 ///  @param  iVert    Index of a vertex to remove from.
 ///  @param  iEdg           Index of a edge to remove.
-void AllEdges::eraseEdge(const int iVert, const BGSIZE iEdg)
+void AllEdges::eraseEdge(int iVert, BGSIZE iEdg)
 {
    edgeCounts_[iVert]--;
    inUse_[iEdg] = false;
@@ -255,8 +255,7 @@ void AllEdges::eraseEdge(const int iVert, const BGSIZE iEdg)
 ///  @param  destVertex The Vertex that receives from the edge.
 ///  @param  deltaT      Inner simulation step duration
 ///  @return  iEdg      Index of the edge to be added.
-BGSIZE AllEdges::addEdge(edgeType type, const int srcVertex, const int destVertex,
-                         const BGFLOAT deltaT)
+BGSIZE AllEdges::addEdge(edgeType type, int srcVertex, int destVertex, BGFLOAT deltaT)
 {
    BGSIZE iEdg;
    if (edgeCounts_[destVertex] >= maxEdgesPerVertex_) {

Simulator/Edges/AllEdges.h

@@ -20,7 +20,7 @@ class AllVertices;
 class AllEdges {
 public:
    AllEdges();
-   AllEdges(const int numVertices, const int maxEdges);
+   AllEdges(int numVertices, int maxEdges);
    virtual ~AllEdges() = default;
 
    ///  Setup the internal structure of the class (allocate memories and initialize them).
@@ -41,8 +41,7 @@ class AllEdges {
    ///  @param  destVertex  The Vertex that receives from the Edge.
    ///  @param  deltaT      Inner simulation step duration
    ///  @return  iEdg        Index of the edge to be added.
-   virtual BGSIZE addEdge(edgeType type, const int srcVertex, const int destVertex,
-                          const BGFLOAT deltaT);
+   virtual BGSIZE addEdge(edgeType type, int srcVertex, int destVertex, BGFLOAT deltaT);
 
    ///  Create a Edge and connect it to the model.
    ///
@@ -51,7 +50,7 @@ class AllEdges {
    ///  @param  destVertex  Coordinates of the destination Vertex.
    ///  @param  deltaT      Inner simulation step duration.
    ///  @param  type        Type of the Edge to create.
-   virtual void createEdge(const BGSIZE iEdg, int srcVertex, int destVertex, const BGFLOAT deltaT,
+   virtual void createEdge(BGSIZE iEdg, int srcVertex, int destVertex, BGFLOAT deltaT,
                            edgeType type)
       = 0;
 
@@ -71,25 +70,25 @@ class AllEdges {
    ///
    ///  @param  numVertices   Total number of vertices in the network.
    ///  @param  maxEdges  Maximum number of edges per vertex.
-   virtual void setupEdges(const int numVertices, const int maxEdges);
+   virtual void setupEdges(int numVertices, int maxEdges);
 
    ///  Sets the data for Edge to input's data.
    ///
    ///  @param  input  istream to read from.
    ///  @param  iEdg   Index of the edge to set.
-   virtual void readEdge(istream &input, const BGSIZE iEdg);
+   virtual void readEdge(istream &input, BGSIZE iEdg);
 
    ///  Write the edge data to the stream.
    ///
    ///  @param  output  stream to print out to.
    ///  @param  iEdg    Index of the edge to print out.
-   virtual void writeEdge(ostream &output, const BGSIZE iEdg) const;
+   virtual void writeEdge(ostream &output, BGSIZE iEdg) const;
 
    ///  Returns an appropriate edgeType object for the given integer.
    ///
    ///  @param  typeOrdinal    Integer that correspond with a edgeType.
    ///  @return the SynapseType that corresponds with the given integer.
-   edgeType edgeOrdinalToType(const int typeOrdinal);
+   edgeType edgeOrdinalToType(int typeOrdinal);
 
    /// Loggers used to print to using log4cplus logging macros, prints to Results/Debug/logging.txt
    log4cplus::Logger fileLogger_;
@@ -186,13 +185,13 @@ class AllEdges {
    ///
    ///  @param  iEdg      Index of the Edge to connect to.
    ///  @param  vertices  The Vertex list to search from.
-   virtual void advanceEdge(const BGSIZE iEdg, AllVertices &vertices) = 0;
+   virtual void advanceEdge(BGSIZE iEdg, AllVertices &vertices) = 0;
 
    ///  Remove a edge from the network.
    ///
    ///  @param  neuronIndex   Index of a vertex to remove from.
    ///  @param  iEdg          Index of a edge to remove.
-   virtual void eraseEdge(const int neuronIndex, const BGSIZE iEdg);
+   virtual void eraseEdge(int neuronIndex, BGSIZE iEdg);
 #endif   // defined(USE_GPU)
 
    ///  The location of the edge.

Simulator/Edges/NG911/All911Edges.cpp

@@ -8,7 +8,7 @@
 
 #include "All911Edges.h"
 
-All911Edges::All911Edges(const int numVertices, const int maxEdges)
+All911Edges::All911Edges(int numVertices, int maxEdges)
 {
 }
 
@@ -31,7 +31,7 @@ void All911Edges::setupEdges()
    }
 }
 
-void All911Edges::createEdge(const BGSIZE iEdg, int srcVertex, int destVertex, const BGFLOAT deltaT,
+void All911Edges::createEdge(BGSIZE iEdg, int srcVertex, int destVertex, BGFLOAT deltaT,
                              edgeType type)
 {
    inUse_[iEdg] = true;
@@ -101,7 +101,7 @@ void All911Edges::advanceEdges(AllVertices &vertices, EdgeIndexMap &edgeIndexMap
 ///
 ///  @param  iEdg      Index of the edge to connect to.
 ///  @param  vertices   The vertex list to search from.
-void All911Edges::advance911Edge(const BGSIZE iEdg, All911Vertices &vertices)
+void All911Edges::advance911Edge(BGSIZE iEdg, All911Vertices &vertices)
 {
    // edge
    // source node   -->   destination node