Merge pull request #743 from htm-community/tm_predictivecells

TM.getPredictiveCells improved

Author: breznak

src/htm/algorithms/Connections.cpp

@@ -122,10 +122,10 @@ Synapse Connections::createSynapse(Segment segment,
     synapse = destroyedSynapses_.back();
     destroyedSynapses_.pop_back();
   } else {
-    NTA_CHECK(synapses_.size() < std::numeric_limits<Synapse>::max()) << "Add synapse failed: Range of Synapse (data-type) insufficient size."
+    NTA_ASSERT(synapses_.size() < std::numeric_limits<Synapse>::max()) << "Add synapse failed: Range of Synapse (data-type) insufficient size."
 	    << synapses_.size() << " < " << (size_t)std::numeric_limits<Synapse>::max();
     synapse = static_cast<Synapse>(synapses_.size());
-    synapses_.push_back(SynapseData());
+    synapses_.emplace_back(SynapseData());
   }
 
   // Fill in the new synapse's data

src/htm/algorithms/TemporalMemory.cpp

@@ -36,6 +36,7 @@
 #include <iterator>
 #include <string>
 #include <vector>
+#include <set>
 
 
 #include <htm/algorithms/TemporalMemory.hpp>
@@ -377,7 +378,7 @@ void TemporalMemory::activateCells(const SDR &activeColumns, const bool learn) {
 
     // for column in activeColumns (the 'sparse' above):
     //   get its active segments ( >= connectedThr)
-    //   get its matching segs   ( >= mmm
+    //   get its matching segs   ( >= TODO
     std::tie(column, 
              activeColumnsBegin, activeColumnsEnd, 
              columnActiveSegmentsBegin, columnActiveSegmentsEnd, 
@@ -603,16 +604,15 @@ SDR TemporalMemory::getPredictiveCells() const {
   correctDims.push_back(static_cast<CellIdx>(getCellsPerColumn()));
   SDR predictive(correctDims);
 
-  auto& predictiveCells = predictive.getSparse();
+  std::set<CellIdx> uniqueCells;
+  //uniqueCells.reserve(activeSegments_.size());
 
-  for (auto segment = activeSegments_.cbegin(); segment != activeSegments_.cend();
-       segment++) {
-    const CellIdx cell = connections.cellForSegment(*segment);
-    if (segment == activeSegments_.begin() || cell != predictiveCells.back()) {
-      predictiveCells.push_back(cell);
-    }
+  for (const auto segment : activeSegments_) {
+    const CellIdx cell = connections.cellForSegment(segment);
+    uniqueCells.insert(cell); //set keeps the cells unique
   }
 
+  vector<CellIdx> predictiveCells(uniqueCells.begin(), uniqueCells.end());
   predictive.setSparse(predictiveCells);
   return predictive;
 }