Connections: apply synapsesCompetition() in adaptSegment()

src/htm/algorithms/Connections.cpp

@@ -519,6 +519,9 @@ void Connections::adaptSegment(const Segment segment,
     }
   }
 
+  //balance synapses using competition on dendrite
+  synapseCompetition(segment, 8, 11); //FIXME derive these numbers
+
   //destroy synapses accumulated for pruning
   for(const auto pruneSyn : destroyLater) {
     destroySynapse(pruneSyn);
@@ -599,7 +602,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 );
 
@@ -624,7 +628,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

@@ -469,7 +469,7 @@ class Connections : public Serializable
    * @param increment  Change in permanence for synapses with active presynapses.
    * @param decrement  Change in permanence for synapses with inactive presynapses.
    * @param pruneZeroSynapses (default false) If set, synapses that reach minPermanence(aka. "zero")
-   *        are removed. This is used in TemporalMemory.
+   *        are removed. This is used in TemporalMemory and SpatialPooler.  
    * @param segmentThreshold (optional) (default 0) Minimum number of connected synapses for a segment
    *        to be considered active. @see raisePermenencesToThreshold(). Equivalent to `SP.stimulusThreshold`.
    *        If `pruneZeroSynapses` is used and synapses are removed, if the amount of synapses drops below 
@@ -523,7 +523,7 @@ class Connections : public Serializable
    */
   void synapseCompetition(  const Segment    segment,
                             const SynapseIdx minimumSynapses,
-                            const SynapseIdx maximumSynapses);
+                            const SynapseIdx maximumSynapses); 
 
 
   /**

src/htm/algorithms/SpatialPooler.cpp

@@ -710,7 +710,7 @@ Real SpatialPooler::avgConnectedSpanForColumnND_(const 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_ );
   }
 }