Connections: apply synapsesCompetition() in adaptSegment()

src/htm/algorithms/Connections.cpp

@@ -250,18 +250,14 @@ 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) -> bool {
-			 return dataForSynapse(a).id < dataForSynapse(b).id;
-                       });
-
-  NTA_ASSERT(synapseOnSegment != segmentData.synapses.end());
+  const auto synapseOnSegment = std::find(segmentData.synapses.cbegin(), 
+		                          segmentData.synapses.cend(),
+					  synapse);
+
+  NTA_ASSERT(synapseOnSegment != segmentData.synapses.cend());
   NTA_ASSERT(*synapseOnSegment == synapse);
 
   segmentData.synapses.erase(synapseOnSegment);
-
   destroyedSynapses_.push_back(synapse);
 }
 
@@ -348,7 +344,7 @@ bool Connections::compareSegments(const Segment a, const Segment b) const {
   // default sort by cell
   if (aData.cell == bData.cell)
     //fallback to ordinals:
-    return aData.id < bData.id;
+    return aData.id < bData.id; //TODO is segment's id/ordinals needed?
   else return aData.cell < bData.cell;
 }
 
@@ -479,6 +475,9 @@ void Connections::adaptSegment(const Segment segment,
     }
   }
 
+  //balance synapses using competition on dendrite
+  synapseCompetition(segment, 4, 10); //FIXME derive these numbers
+
   //destroy segment if it has too few synapses left -> will never be able to connect again
   if(pruneZeroSynapses and synapses.size() < connectedThreshold_) {
     destroySegment(segment);
@@ -549,7 +548,8 @@ void Connections::synapseCompetition(
                     const SynapseIdx maximumSynapses)
 {
   NTA_ASSERT( minimumSynapses <= maximumSynapses);
-  NTA_ASSERT( maximumSynapses > 0 );
+  NTA_ASSERT( maximumSynapses >= connectedThreshold );
+  NTA_ASSERT( minimumSynapses <  connectedThreshold );
 
   const auto &segData = dataForSegment( segment );
 
@@ -574,7 +574,7 @@ void Connections::synapseCompetition(
   // Can't connect more synapses than there are in the potential pool.
   desiredConnected = std::min( (SynapseIdx) segData.synapses.size(), desiredConnected);
   // The N'th synapse is at index N-1
-  if( desiredConnected != 0 ) {
+  if( desiredConnected > 0 ) {
     desiredConnected--;
   }
   // else {

src/htm/algorithms/Connections.hpp

@@ -510,7 +510,7 @@ class Connections : public Serializable
    */
   void synapseCompetition(  const Segment    segment,
                             const SynapseIdx minimumSynapses,
-                            const SynapseIdx maximumSynapses);
+                            const SynapseIdx maximumSynapses); 
 
 
   /**

src/htm/algorithms/SpatialPooler.cpp

@@ -702,7 +702,7 @@ Real SpatialPooler::avgConnectedSpanForColumnND_(UInt column) const {
 void SpatialPooler::adaptSynapses_(const SDR &input,
                                    const SDR &active) {
   for(const auto &column : active.getSparse()) {
-    connections_.adaptSegment(column, input, synPermActiveInc_, synPermInactiveDec_);
+    connections_.adaptSegment(column, input, synPermActiveInc_, synPermInactiveDec_, true);
     connections_.raisePermanencesToThreshold( column, stimulusThreshold_ );
   }
 }