diff --git a/src/main/java/org/numenta/nupic/network/sensor/BatchedCsvStream.java b/src/main/java/org/numenta/nupic/network/sensor/BatchedCsvStream.java index 603ad74a..41c663d7 100644 --- a/src/main/java/org/numenta/nupic/network/sensor/BatchedCsvStream.java +++ b/src/main/java/org/numenta/nupic/network/sensor/BatchedCsvStream.java @@ -864,6 +864,7 @@ public static void main(String[] args) { "7/2/10 19:00,38.2", "7/2/10 20:00,14.1"); + @SuppressWarnings("resource") BatchedCsvStream csv = new BatchedCsvStream<>(stream, 3); System.out.println("Header: " + csv.getHeader()); csv.continuation(false).forEach(l -> System.out.println("line: " + Arrays.toString(l))); diff --git a/src/test/java/org/numenta/nupic/network/LayerTest.java b/src/test/java/org/numenta/nupic/network/LayerTest.java index 6546da12..cf38f78c 100644 --- a/src/test/java/org/numenta/nupic/network/LayerTest.java +++ b/src/test/java/org/numenta/nupic/network/LayerTest.java @@ -215,8 +215,6 @@ public void testHalt() { final Layer l = new Layer<>(n); l.add(htmSensor); - l.start(); - l.subscribe(new Observer() { @Override public void onCompleted() { assertTrue(l.isHalted()); @@ -225,6 +223,8 @@ public void testHalt() { @Override public void onError(Throwable e) { e.printStackTrace(); } @Override public void onNext(Inference output) {} }); + + l.start(); try { l.halt(); @@ -255,8 +255,6 @@ public void testReset() { final Layer l = new Layer<>(n); l.add(htmSensor); - l.start(); - l.subscribe(new Observer() { @Override public void onCompleted() {} @Override public void onError(Throwable e) { e.printStackTrace(); } @@ -266,6 +264,8 @@ public void testReset() { } } }); + + l.start(); try { l.getLayerThread().join(); @@ -295,8 +295,6 @@ public void testSequenceChangeReset() { final Layer l = new Layer<>(n); l.add(htmSensor); - l.start(); - l.subscribe(new Observer() { @Override public void onCompleted() {} @Override public void onError(Throwable e) { e.printStackTrace(); } @@ -306,6 +304,8 @@ public void testSequenceChangeReset() { } } }); + + l.start(); try { l.getLayerThread().join(); @@ -340,8 +340,6 @@ public void testLayerWithObservableInput() { final Layer l = new Layer<>(n); l.add(htmSensor); - l.start(); - l.subscribe(new Observer() { int idx = 0; @Override public void onCompleted() {} @@ -358,6 +356,8 @@ public void testLayerWithObservableInput() { ++idx; } }); + + l.start(); try { String[] entries = { @@ -401,8 +401,6 @@ public void testLayerWithObservableInputIntegerArray() { final Layer l = new Layer<>(n); l.add(htmSensor); - l.start(); - String input = "[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, " + "1, 1, 1, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, " + "0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, " @@ -431,6 +429,8 @@ public void testLayerWithObservableInputIntegerArray() { assertEquals(input, Arrays.toString((int[])output.getLayerInput())); } }); + + l.start(); try { String[] entries = { @@ -1456,7 +1456,7 @@ public void isClosedAddSensorTest() { p = p.union(NetworkTestHarness.getNetworkDemoTestEncoderParams()); p.setParameterByKey(KEY.RANDOM, new MersenneTwister(42)); - Layer l = Network.createLayer("l", p); + Layer l = Network.createLayer("l", p); l.close(); Sensor sensor = Sensor.create( @@ -1472,7 +1472,7 @@ public void isClosedAddMultiEncoderTest() { p = p.union(NetworkTestHarness.getNetworkDemoTestEncoderParams()); p.setParameterByKey(KEY.RANDOM, new MersenneTwister(42)); - Layer l = Network.createLayer("l", p); + Layer l = Network.createLayer("l", p); l.close(); l.add(MultiEncoder.builder().name("").build()); @@ -1484,7 +1484,7 @@ public void isClosedAddSpatialPoolerTest() { p = p.union(NetworkTestHarness.getNetworkDemoTestEncoderParams()); p.setParameterByKey(KEY.RANDOM, new MersenneTwister(42)); - Layer l = Network.createLayer("l", p); + Layer l = Network.createLayer("l", p); l.close(); l.add(new SpatialPooler()); diff --git a/src/test/java/org/numenta/nupic/network/NetworkTest.java b/src/test/java/org/numenta/nupic/network/NetworkTest.java index eeeec2e4..de275720 100644 --- a/src/test/java/org/numenta/nupic/network/NetworkTest.java +++ b/src/test/java/org/numenta/nupic/network/NetworkTest.java @@ -940,11 +940,11 @@ public void closeTest() { p.setParameterByKey(KEY.RANDOM, new MersenneTwister(42)); Region region1 = Network.createRegion("region1"); - Layer layer1 = Network.createLayer("layer1", p); + Layer layer1 = Network.createLayer("layer1", p); region1.add(layer1); Region region2 = Network.createRegion("region2"); - Layer layer2 = Network.createLayer("layer2", p); + Layer layer2 = Network.createLayer("layer2", p); region2.add(layer2); Network network = Network.create("test network", p);