Conn: synapseOrdinals_ moved to SynapseData

Author: breznak

src/htm/algorithms/Connections.cpp

@@ -47,18 +47,12 @@ void Connections::initialize(CellIdx numCells, Permanence connectedThreshold, bo
   connectedSynapsesForPresynapticCell_.clear();
   potentialSegmentsForPresynapticCell_.clear();
   connectedSegmentsForPresynapticCell_.clear();
-  synapseOrdinals_.clear();
   eventHandlers_.clear();
   NTA_CHECK(connectedThreshold >= minPermanence);
   NTA_CHECK(connectedThreshold <= maxPermanence);
   connectedThreshold_ = connectedThreshold - htm::Epsilon;
   iteration_ = 0;
 
-  // Every time a segment or synapse is created, we assign it an ordinal and
-  // increment the nextOrdinal. Ordinals are never recycled, so they can be used
-  // to order segments or synapses by age.
-  nextSynapseOrdinal_ = 0;
-
   nextEventToken_ = 0;
 
   timeseries_ = timeseries;
@@ -132,14 +126,13 @@ Synapse Connections::createSynapse(Segment segment,
 	    << synapses_.size() << " < " << (size_t)std::numeric_limits<Synapse>::max();
     synapse = static_cast<Synapse>(synapses_.size());
     synapses_.push_back(SynapseData());
-    synapseOrdinals_.push_back(0);
   }
 
   // Fill in the new synapse's data
   SynapseData &synapseData    = synapses_[synapse];
   synapseData.presynapticCell = presynapticCell;
   synapseData.segment         = segment;
-  synapseOrdinals_[synapse]   = nextSynapseOrdinal_++;
+  synapseData.id              = nextSynapseOrdinal_++; //TODO move these to SynData constructor
   // Start in disconnected state.
   synapseData.permanence           = connectedThreshold_ - 1.0f;
   synapseData.presynapticMapIndex_ = 
@@ -267,9 +260,8 @@ void Connections::destroySynapse(const Synapse synapse) {
   const auto synapseOnSegment =
       std::lower_bound(segmentData.synapses.cbegin(), segmentData.synapses.cend(),
                        synapse, 
-		       [&](const Synapse a, const Synapse b) {
-		         if(synapseOrdinals_[a] == synapseOrdinals_[b]) return a < b;
-			 else return synapseOrdinals_[a] < synapseOrdinals_[b];
+		       [&](const Synapse a, const Synapse b) -> bool {
+			 return dataForSynapse(a).id < dataForSynapse(b).id;
                        });
 
   NTA_ASSERT(synapseOnSegment != segmentData.synapses.end());

src/htm/algorithms/Connections.hpp

@@ -47,6 +47,7 @@ const Permanence minPermanence = 0.0f;
 const Permanence maxPermanence = 1.0f;
 
 
+
 /**
  * SynapseData class used in Connections.
  *
@@ -64,6 +65,9 @@ struct SynapseData: public Serializable {
   Permanence permanence;
   Segment segment;
   Synapse presynapticMapIndex_;
+  Synapse id;
+
+  SynapseData() {}
 
   CerealAdapter;
   template<class Archive>
@@ -91,15 +95,13 @@ struct SynapseData: public Serializable {
  * The cell that this segment is on.
  */
 struct SegmentData {
-  SegmentData(const CellIdx cell, UInt32 lastUsed = 0) : cell(cell), numConnected(0), lastUsed(lastUsed), id(nextId++) {} //default constructor
+  SegmentData(const CellIdx cell, Segment id, UInt32 lastUsed = 0) : cell(cell), numConnected(0), id(id), lastUsed(lastUsed) {} //default constructor
 
   std::vector<Synapse> synapses;
   CellIdx cell; //mother cell that this segment originates from
   SynapseIdx numConnected; //number of permanences from `synapses` that are >= synPermConnected, ie connected synapses
+  Segment id;
   UInt32 lastUsed = 0; //last used time (iteration). Used for segment pruning by "least recently used" (LRU) in `createSegment`
-  Segment id; 
-private:
-    Segment nextId = 0;
 };
 
 /**
@@ -720,7 +722,7 @@ class Connections : public Serializable
   std::map<CellIdx, std::vector<Segment>> potentialSegmentsForPresynapticCell_;
   std::map<CellIdx, std::vector<Segment>> connectedSegmentsForPresynapticCell_;
 
-  std::vector<Synapse> synapseOrdinals_;
+  Segment nextSegmentOrdinal_ = 0;
   Synapse nextSynapseOrdinal_ = 0;
 
   // These three members should be used when working with highly correlated