Skip to content

Commit 13335c6

Browse files
cogmissioncogmission
committed
Merge pull request #313 from cogmission/0.6.3-SNAPSHOT
0.6.3 snapshot
2 parents 3b540f6 + 8ccb3d5 commit 13335c6

File tree

3 files changed

+51
-56
lines changed

3 files changed

+51
-56
lines changed

‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ apply plugin: 'eclipse'
44
apply plugin: 'signing'
55

66
group = 'org.numenta'
7-
version = '0.6.2'
7+
version = '0.6.3-SNAPSHOT'
88
archivesBaseName = 'htm.java'
99

1010
sourceCompatibility = 1.8
1111
targetCompatibility = 1.8
1212

1313
jar {
1414
manifest {
15-
attributes 'Implementation-Title': 'htm.java', 'Implementation-Version': '0.6.2'
15+
attributes 'Implementation-Title': 'htm.java', 'Implementation-Version': '0.6.3-SNAPSHOT'
1616
}
1717
}
1818

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.numenta</groupId>
66
<artifactId>htm.java</artifactId>
7-
<version>0.6.2</version>
7+
<version>0.6.3-SNAPSHOT</version>
88
<name>htm.java</name>
99
<description>The Java version of Numenta's HTM technology</description>
1010

‎src/test/java/org/numenta/nupic/network/LayerTest.java

+48-53
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,7 @@ public void testHalt() {
247247
isHalted = true;
248248
}
249249
@Override public void onError(Throwable e) { e.printStackTrace(); }
250-
@Override public void onNext(Inference output) {
251-
System.out.println("output = " + Arrays.toString(output.getSDR()));
252-
}
250+
@Override public void onNext(Inference output) {}
253251
});
254252

255253
try {
@@ -266,9 +264,9 @@ public void testHalt() {
266264
@Test
267265
public void testReset() {
268266
Sensor<File> sensor = Sensor.create(
269-
FileSensor::create,
270-
SensorParams.create(
271-
Keys::path, "", ResourceLocator.path("rec-center-hourly-4reset.csv")));
267+
FileSensor::create,
268+
SensorParams.create(
269+
Keys::path, "", ResourceLocator.path("rec-center-hourly-4reset.csv")));
272270

273271
Parameters p = NetworkTestHarness.getParameters().copy();
274272
p = p.union(NetworkTestHarness.getHotGymTestEncoderParams());
@@ -306,9 +304,9 @@ public void testReset() {
306304
@Test
307305
public void testSequenceChangeReset() {
308306
Sensor<File> sensor = Sensor.create(
309-
FileSensor::create,
310-
SensorParams.create(
311-
Keys::path, "", ResourceLocator.path("rec-center-hourly-4seqReset.csv")));
307+
FileSensor::create,
308+
SensorParams.create(
309+
Keys::path, "", ResourceLocator.path("rec-center-hourly-4seqReset.csv")));
312310

313311
Parameters p = NetworkTestHarness.getParameters().copy();
314312
p = p.union(NetworkTestHarness.getHotGymTestEncoderParams());
@@ -345,15 +343,15 @@ public void testSequenceChangeReset() {
345343
@Test
346344
public void testLayerWithObservableInput() {
347345
Publisher manual = Publisher.builder()
348-
.addHeader("timestamp,consumption")
349-
.addHeader("datetime,float")
350-
.addHeader("B")
351-
.build();
346+
.addHeader("timestamp,consumption")
347+
.addHeader("datetime,float")
348+
.addHeader("B")
349+
.build();
352350

353351
Sensor<ObservableSensor<String[]>> sensor = Sensor.create(
354-
ObservableSensor::create,
355-
SensorParams.create(
356-
Keys::obs, new Object[] {"name", manual}));
352+
ObservableSensor::create,
353+
SensorParams.create(
354+
Keys::obs, new Object[] {"name", manual}));
357355

358356
Parameters p = NetworkTestHarness.getParameters().copy();
359357
p = p.union(NetworkTestHarness.getHotGymTestEncoderParams());
@@ -387,9 +385,9 @@ public void testLayerWithObservableInput() {
387385

388386
try {
389387
String[] entries = {
390-
"7/2/10 0:00,21.2",
391-
"7/2/10 1:00,34.0",
392-
"7/2/10 2:00,40.4",
388+
"7/2/10 0:00,21.2",
389+
"7/2/10 1:00,34.0",
390+
"7/2/10 2:00,40.4",
393391
};
394392

395393
// Send inputs through the observable
@@ -407,15 +405,15 @@ public void testLayerWithObservableInput() {
407405
@Test
408406
public void testLayerWithObservableInputIntegerArray() {
409407
Publisher manual = Publisher.builder()
410-
.addHeader("sdr_in")
411-
.addHeader("darr")
412-
.addHeader("B")
413-
.build();
408+
.addHeader("sdr_in")
409+
.addHeader("darr")
410+
.addHeader("B")
411+
.build();
414412

415413
Sensor<ObservableSensor<String[]>> sensor = Sensor.create(
416-
ObservableSensor::create,
417-
SensorParams.create(
418-
Keys::obs, new Object[] {"name", manual}));
414+
ObservableSensor::create,
415+
SensorParams.create(
416+
Keys::obs, new Object[] {"name", manual}));
419417

420418
Parameters p = Parameters.getAllDefaultParameters();
421419
p = p.union(getArrayTestParams());
@@ -498,10 +496,10 @@ public void testLayerWithGenericObservable() {
498496
};
499497

500498
Network n = Network.create("Generic Test", p)
501-
.add(Network.createRegion("R1")
502-
.add(Network.createLayer("L1", p)
503-
.add(addedFunc)
504-
.add(new SpatialPooler())));
499+
.add(Network.createRegion("R1")
500+
.add(Network.createLayer("L1", p)
501+
.add(addedFunc)
502+
.add(new SpatialPooler())));
505503

506504
@SuppressWarnings("unchecked")
507505
Layer<int[]> l = (Layer<int[]>)n.lookup("R1").lookup("L1");
@@ -647,7 +645,6 @@ public void testBasicSetupEncoder_AUTO_MODE() {
647645
@Override public void onNext(Inference output) {
648646
// System.out.println(" seq = " + seq + ", recNum = " + output.getRecordNum() + ", expected = " + Arrays.toString(expected[seq]));
649647
// System.out.println(" seq = " + seq + ", recNum = " + output.getRecordNum() + ", output = " + Arrays.toString(output.getSDR()));
650-
if(seq == output.getRecordNum())
651648
assertTrue(Arrays.equals(expected[seq], output.getSDR()));
652649
seq++;
653650
}
@@ -660,7 +657,6 @@ public void testBasicSetupEncoder_AUTO_MODE() {
660657
@Override public void onNext(Inference output) {
661658
// System.out.println(" seq = " + seq2 + ", recNum = " + output.getRecordNum() + ", expected = " + Arrays.toString(expected[seq2]));
662659
// System.out.println(" seq = " + seq2 + ", recNum = " + output.getRecordNum() + ", output = " + Arrays.toString(output.getSDR()));
663-
if(seq2 == output.getRecordNum())
664660
assertTrue(Arrays.equals(expected[seq2], output.getSDR()));
665661
seq2++;
666662
}
@@ -725,9 +721,9 @@ public void onNext(Inference spatialPoolerOutput) {
725721
@Test
726722
public void testBasicSetup_SpatialPooler_AUTO_MODE() {
727723
Sensor<File> sensor = Sensor.create(
728-
FileSensor::create,
729-
SensorParams.create(
730-
Keys::path, "", ResourceLocator.path("days-of-week.csv")));
724+
FileSensor::create,
725+
SensorParams.create(
726+
Keys::path, "", ResourceLocator.path("days-of-week.csv")));
731727

732728
Parameters p = NetworkTestHarness.getParameters().copy();
733729
p = p.union(NetworkTestHarness.getDayDemoTestEncoderParams());
@@ -1117,8 +1113,8 @@ public void testAnomalySetup() {
11171113
params.put(KEY_USE_MOVING_AVG, true);
11181114
Anomaly anomalyComputer = Anomaly.create(params);
11191115

1120-
final Layer<Map<String, Object>> l = new Layer<>(p, me, new SpatialPooler(), new TemporalMemory(),
1121-
Boolean.TRUE, anomalyComputer);
1116+
final Layer<Map<String, Object>> l = new Layer<>(
1117+
p, me, new SpatialPooler(), new TemporalMemory(), Boolean.TRUE, anomalyComputer);
11221118

11231119
l.subscribe(new Observer<Inference>() {
11241120
@Override public void onCompleted() {}
@@ -1312,14 +1308,14 @@ public void testFullLayerFluentAssembly() {
13121308
Anomaly anomalyComputer = Anomaly.create(params);
13131309

13141310
Layer<?> l = Network.createLayer("TestLayer", p)
1315-
.alterParameter(KEY.AUTO_CLASSIFY, true)
1316-
.add(anomalyComputer)
1317-
.add(new TemporalMemory())
1318-
.add(new SpatialPooler())
1319-
.add(Sensor.create(
1320-
FileSensor::create,
1321-
SensorParams.create(
1322-
Keys::path, "", ResourceLocator.path("rec-center-hourly-small.csv"))));
1311+
.alterParameter(KEY.AUTO_CLASSIFY, true)
1312+
.add(anomalyComputer)
1313+
.add(new TemporalMemory())
1314+
.add(new SpatialPooler())
1315+
.add(Sensor.create(
1316+
FileSensor::create,
1317+
SensorParams.create(
1318+
Keys::path, "", ResourceLocator.path("rec-center-hourly-small.csv"))));
13231319

13241320
l.getConnections().printParameters();
13251321

@@ -1330,10 +1326,9 @@ public void testFullLayerFluentAssembly() {
13301326
public void onNext(Inference i) {
13311327
if(flowReceived) return; // No need to set this value multiple times
13321328

1333-
System.out.println("classifier size = " + i.getClassifiers().size());
13341329
flowReceived = i.getClassifiers().size() == 4 &&
1335-
i.getClassifiers().get("timestamp") != null &&
1336-
i.getClassifiers().get("consumption") != null;
1330+
i.getClassifiers().get("timestamp") != null &&
1331+
i.getClassifiers().get("consumption") != null;
13371332
}
13381333
});
13391334

@@ -1349,11 +1344,11 @@ public void onNext(Inference i) {
13491344

13501345
private Parameters getArrayTestParams() {
13511346
Map<String, Map<String, Object>> fieldEncodings = setupMap(
1352-
null,
1353-
884, // n
1354-
0, // w
1355-
0, 0, 0, 0, null, null, null,
1356-
"sdr_in", "darr", "SDRPassThroughEncoder");
1347+
null,
1348+
884, // n
1349+
0, // w
1350+
0, 0, 0, 0, null, null, null,
1351+
"sdr_in", "darr", "SDRPassThroughEncoder");
13571352
Parameters p = Parameters.empty();
13581353
p.setParameterByKey(KEY.FIELD_ENCODING_MAP, fieldEncodings);
13591354
return p;

0 commit comments

Comments
 (0)