Revert "Revert "add SparseBinaryMatrix.rowFromSparse()""

This reverts commit 551c455.
numenta · Dec 31, 2014 · 751caa5 · 751caa5
1 parent 82dcdc6
commit 751caa5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/nupic/algorithms/SpatialPooler.cpp b/src/nupic/algorithms/SpatialPooler.cpp
@@ -539,7 +539,7 @@ void SpatialPooler::initialize(vector<UInt> inputDimensions,
   {
     vector<UInt> potential = mapPotential_(i, wrapAround_);
     vector<Real> perm = initPermanence_(potential, initConnectedPct_);
-    potentialPools_.rowFromDense(i,potential.begin(),potential.end());
+    potentialPools_.rowFromSparse(i,potential.begin(),potential.end());
     updatePermanencesForColumn_(perm,i,true);
   }
 

diff --git a/src/nupic/math/SparseBinaryMatrix.hpp b/src/nupic/math/SparseBinaryMatrix.hpp
@@ -1578,6 +1578,24 @@ namespace nupic {
 	  ind_[row].push_back((size_type)(it - begin));
     }
 
+    //--------------------------------------------------------------------------------
+    template <typename InputIterator>
+    inline void
+    rowFromSparse(size_type row, InputIterator begin, InputIterator end)
+    {
+      { // Pre-conditions
+        NTA_ASSERT(row < nRows())
+          << "SparseBinaryMatrix::rowFromDense: "
+          << "Invalid row index: " << row;
+      } // End pre-conditions
+
+      ind_[row].clear();
+      for (InputIterator it = begin; it != end; ++it)
+        if (!nearlyZero(*it))
+          ind_[row].push_back(*it);
+    }
+
+
     //--------------------------------------------------------------------------------
     template <typename OutputIterator>
     inline void