Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/main/java/org/numenta/nupic/algorithms/SpatialPooler.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import org.numenta.nupic.Connections;
import org.numenta.nupic.model.Column;
Expand Down Expand Up @@ -898,11 +902,19 @@ public int[] inhibitColumns(Connections c, double[] overlaps) {
* @return
*/
public int[] inhibitColumnsGlobal(Connections c, double[] overlaps, double density) {
int numCols = c.getNumColumns();
int numActive = (int)(density * numCols);
int[] winners = ArrayUtils.nGreatest(overlaps, numActive);
Arrays.sort(winners);
return winners;
int numCols = c.getNumColumns();
int numActive = (int)(density * numCols);
return IntStream.range(0, overlaps.length)
.boxed()
.collect(Collectors.toMap(index->index, index->overlaps[index]))
.entrySet()
.stream()
.sorted(Map.Entry.<Integer, Double>comparingByValue().reversed())
.limit(numActive)
.map(Entry::getKey)
.sorted()
.mapToInt(Integer::intValue)
.toArray();
}

/**
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/org/numenta/nupic/util/ArrayUtilsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -323,4 +323,10 @@ public void testIsSparse() {
assertFalse(ArrayUtils.isSparse(t));
assertTrue(ArrayUtils.isSparse(t1));
}

@Test
public void testNGreatest() {
double[] overlaps = new double[] { 1, 2, 1, 4, 8, 3, 12, 5, 4, 1 };
assertTrue(Arrays.equals(new int[] { 6, 4, 7 }, ArrayUtils.nGreatest(overlaps, 3)));
}
}