Merge 4f9e776 into 73f8f35

src/main/algorithms/Connections.cpp

@@ -36,6 +36,7 @@ Connections::Connections(CellIdx numCells) : cells_(numCells) {}
 Segment Connections::createSegment(const Cell& cell)
 {
   vector<SegmentData>& segments = cells_[cell.idx].segments;
+  // TODO: Assert that index will be smaller than max size
   Segment segment(segments.size(), cell);
 
   SegmentData segmentData;
@@ -51,6 +52,7 @@ Synapse Connections::createSynapse(const Segment& segment,
   const Cell& cell = segment.cell;
 
   vector<SynapseData>& synapses = cells_[cell.idx].segments[segment.idx].synapses;
+  // TODO: Assert that index will be smaller than max size
   Synapse synapse(synapses.size(), segment);
 
   SynapseData synapseData = {presynapticCell, permanence};
@@ -198,6 +200,30 @@ vector<Cell> Connections::activeCells(const Activity& activity)
   return cells;
 }
 
+UInt Connections::numSegments() const
+{
+  UInt num = 0;
+
+  for (vector<CellData>::const_iterator cell = cells_.begin(); cell != cells_.end(); cell++) {
+    num += cell->segments.size();
+  }
+
+  return num;
+}
+
+UInt Connections::numSynapses() const
+{
+  UInt num = 0;
+
+  for (vector<CellData>::const_iterator cell = cells_.begin(); cell != cells_.end(); cell++) {
+    for (vector<SegmentData>::const_iterator segment = cell->segments.begin(); segment != cell->segments.end(); segment++) {
+      num += segment->synapses.size();
+    }
+  }
+
+  return num;
+}
+
 bool Cell::operator==(const Cell &other) const {
   return idx == other.idx;
 }

src/main/algorithms/Connections.hpp

@@ -41,8 +41,8 @@ namespace nta
     namespace connections
     {
       typedef UInt32 CellIdx;
-      typedef Byte SegmentIdx;
-      typedef Byte SynapseIdx;
+      typedef unsigned char SegmentIdx;
+      typedef unsigned char SynapseIdx;
       typedef Real32 Permanence;
 
       /**
@@ -315,6 +315,22 @@ namespace nta
         */
         std::vector<Cell> activeCells(const Activity& activity);
 
+        // Debugging
+
+        /**
+         Gets the number of segments.
+
+         @retval Number of segments.
+        */
+        UInt numSegments() const;
+
+        /**
+         Gets the number of synapses.
+
+         @retval Number of synapses.
+        */
+        UInt numSynapses() const;
+
       private:
         std::vector<CellData> cells_;
         // Mapping (presynaptic cell => synapses) used in forward propagation

src/test/unit/algorithms/ConnectionsTest.cpp

@@ -42,6 +42,8 @@ namespace nta {
     testMostActiveSegmentForCellsNone();
     testComputeActivity();
     testActiveSegments();
+    testNumSegments();
+    testNumSynapses();
   }
 
   /**
@@ -270,6 +272,30 @@ namespace nta {
     TESTEQUAL(activeCells[0].idx, 20);
   }
 
+  /**
+   * Creates a sample set of connections, and makes sure that we can get the
+   * correct number of segments.
+   */
+  void ConnectionsTest::testNumSegments()
+  {
+    Connections connections(1024);
+    setupSampleConnections(connections);
+
+    TESTEQUAL(connections.numSegments(), 3);
+  }
+
+  /**
+   * Creates a sample set of connections, and makes sure that we can get the
+   * correct number of synapses.
+   */
+  void ConnectionsTest::testNumSynapses()
+  {
+    Connections connections(1024);
+    setupSampleConnections(connections);
+
+    TESTEQUAL(connections.numSynapses(), 8);
+  }
+
   void ConnectionsTest::setupSampleConnections(Connections &connections)
   {
     Segment segment;

src/test/unit/algorithms/ConnectionsTest.hpp

@@ -55,6 +55,8 @@ namespace nta
     void testComputeActivity();
     void testActiveSegments();
     void testActiveCells();
+    void testNumSegments();
+    void testNumSynapses();
 
     void setupSampleConnections(Connections &connections);
     Activity computeSampleActivity(Connections &connections);