changed_conngrowth_class_radii_access_to_elements

Author: eeemily17

Connections/ConnGrowth.cpp

@@ -516,7 +516,7 @@ void ConnGrowth::printRadii() const {
 	}
 #else // !USE_GPU
 	for (int i = 0; i < radiiSize; i++) {
-		cout << "radii[" << i << "] = " << radii->theVector[i] << endl;
+		cout << "radii[" << i << "] = " << (*radii)[i] << endl;
 	}
 #endif // !USE_GPU
 }

Connections/ConnGrowth.h

@@ -352,16 +352,15 @@ void ConnGrowth::save(Archive & archive) const {
     }
     // serialization
     archive(radiiVector);
-#else
+#else // !USE_GPU
     // uses vector to save radii
     vector<BGFLOAT> radiiVector;
     for(int i = 0; i < radiiSize; i++) {
-        // access CPU radii in VectorMatrix
-        radiiVector.push_back(radii->theVector[i]);
+        radiiVector.push_back((*radii)[i]);
     }
     // serialization
-    archive(radiiVector);  
-#endif 
+    archive(radiiVector);
+#endif // !USE_GPU
 }
 
 /**
@@ -387,7 +386,7 @@ void ConnGrowth::load(Archive & archive) {
     for(int i = 0; i < radiiSize; i++) {
         radii[i] = radiiVector[i];
     }
-#else
+#else // !USE_GPU
     // uses vector to load radii
     vector<BGFLOAT> radiiVector;
 
@@ -399,11 +398,11 @@ void ConnGrowth::load(Archive & archive) {
         cerr << "Failed deserializing radii. Please verify totalNeurons data member in SimulationInfo class." << endl;
         throw cereal::Exception("Deserialization Error");
     }
-
+    
     // assigns serialized data to objects
     for(int i = 0; i < radiiSize; i++) {
-        radii->theVector[i] = radiiVector[i];
-    }       
-#endif 
+        (*radii)[i] = radiiVector[i];
+    }
+#endif // !USE_GPU
 }
 

Core/Model.h

@@ -166,7 +166,7 @@ class Model : public IModel
         // kind of a hack to do error handling for read params
         int m_read_params;
 
-    // 2019/12/21 Modified access level to puclic for allowing the access of Connections() and Layout() when calling Connections::createSynapsesFromWeights() method in BGDriver
+    // 2019/12/21 Modified access level to public for allowing the access of Connections() and Layout() when calling Connections::createSynapsesFromWeights() method in BGDriver
     public:       
         /**
          *  Pointer to the Connection object.

Matrix/Matrix.h

@@ -124,4 +124,4 @@ class Matrix
  */
 ostream& operator<<(ostream& os, const Matrix& obj);
 
-#endif
+#endif

Matrix/VectorMatrix.h

@@ -378,18 +378,15 @@ class VectorMatrix : public Matrix
   using Matrix::rows;
   using Matrix::columns;
 
-// 2020/2/9 changed *theVector access level to public due to serialization/deserialization of radii in the ConnGrowth class 
-public:
+private:
   /** Pointer to dynamically allocated 1D array */
   BGFLOAT *theVector;
 
-private:
   /** The number of elements in "theVector" */
   int size;
 
   /** A normal RNG for the whole class */
   static Norm nRng;
 
 };
-
 #endif

Synapses/IAllSynapsesProps.h

@@ -115,4 +115,9 @@ class IAllSynapsesProps
          *  @param  iSyn    Index of the synapse to print out.
          */
         virtual void writeSynapseProps(ostream& output, const BGSIZE iSyn) const = 0;
+
+        /**
+         *  Prints SynapsesProps data.
+         */
+        virtual void printSynapsesProps() const = 0;
 };