fixes for type changes

Author: breznak

src/htm/algorithms/SpatialPooler.cpp

@@ -842,7 +842,7 @@ void SpatialPooler::calculateOverlapPct_(const vector<SynapseIdx> &overlaps,
 
 
 void SpatialPooler::inhibitColumns_(const vector<Real> &overlaps,
-                                    vector<UInt> &activeColumns) const {
+                                    vector<CellIdx> &activeColumns) const {
   Real density = localAreaDensity_;
   if (numActiveColumnsPerInhArea_ > 0) {
     UInt inhibitionArea =

src/htm/algorithms/SpatialPooler.hpp

@@ -921,7 +921,7 @@ class SpatialPooler : public Serializable
      columns.
   */
   void inhibitColumns_(const vector<Real> &overlaps,
-                       vector<UInt> &activeColumns) const;
+                       vector<CellIdx> &activeColumns) const;
 
   /**
      Perform global inhibition.

src/htm/algorithms/TemporalMemory.cpp

@@ -427,13 +427,13 @@ void TemporalMemory::activateCells(const SDR &activeColumns, const bool learn) {
   const auto columnForSegment = [&](Segment segment) {
     return connections.cellForSegment(segment) / cellsPerColumn_;
   };
-  const auto identity = [](const UInt a) {return a;}; //TODO use std::identity when c++20
+  const auto identity = [](const ElemSparse a) {return a;}; //TODO use std::identity when c++20
 
   for (auto &&columnData : groupBy( //group by columns, and convert activeSegments & matchingSegments to cols. 
            sparse, identity,
            activeSegments_, columnForSegment,
            matchingSegments_, columnForSegment)) {
-    UInt column;
+    CellIdx column;
     vector<Segment>::const_iterator activeColumnsBegin, activeColumnsEnd, 
 	       columnActiveSegmentsBegin, columnActiveSegmentsEnd, 
          columnMatchingSegmentsBegin, columnMatchingSegmentsEnd;
@@ -598,9 +598,12 @@ SDR TemporalMemory::cellsToColumns(const SDR& cells) const {
   auto correctDims = getColumnDimensions(); //nD column dimensions (eg 10x100)
   correctDims.push_back(static_cast<CellIdx>(getCellsPerColumn())); //add n+1-th dimension for cellsPerColumn (eg. 10x100x8)
 
-  NTA_CHECK(cells.dimensions == correctDims) 
+  NTA_CHECK(cells.dimensions.size() == correctDims.size()) 
 	  << "cells.dimensions must match TM's (column dims x cellsPerColumn) ";
 
+  for(size_t i = 0; i<correctDims.size(); i++) 
+	  NTA_CHECK(correctDims[i] == cells.dimensions[i]);
+
   SDR cols(getColumnDimensions());
   auto& dense = cols.getDense();
   for(const auto cell : cells.getSparse()) {

src/htm/types/Sdr.cpp

@@ -318,7 +318,7 @@ namespace htm {
         NTA_CHECK( ( 1 + fractionNoise) * getSparsity() <= 1. );
 
         const UInt num_move_bits = (UInt) std::round( fractionNoise * getSum() );
-        const vector<UInt> turn_off = rng.sample(getSparse(), num_move_bits);
+        const auto& turn_off = rng.sample(getSparse(), num_move_bits);
 
         auto& dns = getDense();
 

src/htm/utils/GroupBy.hpp

@@ -77,7 +77,7 @@ static KeyType minFrontKey(KeyType frontrunner, Iterator0 begin0,
   KeyType ret = frontrunner;
 
   if (begin0 != end0) {
-    ret = std::min(ret, keyFn0(*begin0));
+    ret = std::min(ret, static_cast<KeyType>(keyFn0(*begin0)));
   }
 
   if (begin1 != end1) {