Skip to content

Commit 80f762e

Browse files
author
cogmission
committed
Completed TM NuPIC identity test through RunLayer; TM re-write complete
1 parent 1955590 commit 80f762e

38 files changed

+2840
-5116
lines changed

Diff for: .classpath

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<classpathentry kind="lib" path="libs/java-util-1.19.3.jar" sourcepath="/Users/cogmission/.m2/repository/com/cedarsoftware/java-util/1.19.3/java-util-1.19.3-sources.jar"/>
1818
<classpathentry kind="lib" path="libs/objenesis-2.1.jar"/>
1919
<classpathentry kind="lib" path="libs/algorithmfoundry-shade-culled-1.3.jar"/>
20-
<classpathentry kind="lib" path="libs/fst-2.45.jar"/>
20+
<classpathentry kind="lib" path="libs/fst-2.45.jar" sourcepath="/Users/cogmission/git/fast-serialization/src/main/java"/>
21+
<classpathentry kind="lib" path="libs/jackson-annotations-2.4.0.jar"/>
22+
<classpathentry kind="lib" path="libs/jackson-core-2.4.4.jar"/>
23+
<classpathentry kind="lib" path="libs/jackson-databind-2.4.4.jar"/>
2124
<classpathentry kind="output" path="bin"/>
2225
</classpath>

Diff for: src/jmh/java/org/numenta/nupic/benchmarks/AbstractAlgorithmBenchmark.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.numenta.nupic.Parameters;
2626
import org.numenta.nupic.Parameters.KEY;
2727
import org.numenta.nupic.algorithms.SpatialPooler;
28-
import org.numenta.nupic.algorithms.OldTemporalMemory;
28+
import org.numenta.nupic.algorithms.TemporalMemory;
2929
import org.numenta.nupic.encoders.ScalarEncoder;
3030
import org.numenta.nupic.model.Connections;
3131
import org.openjdk.jmh.annotations.Scope;
@@ -38,7 +38,7 @@ public abstract class AbstractAlgorithmBenchmark {
3838
protected int[] SDR;
3939
protected ScalarEncoder encoder;
4040
protected SpatialPooler pooler;
41-
protected OldTemporalMemory temporalMemory;
41+
protected TemporalMemory temporalMemory;
4242
protected Connections memory;
4343

4444
@Setup
@@ -65,8 +65,8 @@ public void init() {
6565
pooler = new SpatialPooler();
6666
pooler.init(memory);
6767

68-
temporalMemory = new OldTemporalMemory();
69-
OldTemporalMemory.init(memory);
68+
temporalMemory = new TemporalMemory();
69+
TemporalMemory.init(memory);
7070
}
7171

7272
/**

Diff for: src/main/java/org/numenta/nupic/Parameters.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.Set;
3434

3535
import org.numenta.nupic.algorithms.SpatialPooler;
36-
import org.numenta.nupic.algorithms.OldTemporalMemory;
36+
import org.numenta.nupic.algorithms.TemporalMemory;
3737
import org.numenta.nupic.model.Cell;
3838
import org.numenta.nupic.model.Column;
3939
import org.numenta.nupic.model.ComputeCycle;
@@ -50,13 +50,13 @@
5050
import com.cedarsoftware.util.DeepEquals;
5151

5252
/**
53-
* Specifies parameters to be used as a configuration for a given {@link OldTemporalMemory}
53+
* Specifies parameters to be used as a configuration for a given {@link TemporalMemory}
5454
* or {@link SpatialPooler}
5555
*
5656
* @author David Ray
5757
* @author Kirill Solovyev
5858
* @see SpatialPooler
59-
* @see OldTemporalMemory
59+
* @see TemporalMemory
6060
* @see Connections
6161
* @see ComputeCycle
6262
*/
@@ -144,7 +144,7 @@ public class Parameters implements Persistable {
144144
}
145145

146146
/**
147-
* Constant values representing configuration parameters for the {@link OldTemporalMemory}
147+
* Constant values representing configuration parameters for the {@link TemporalMemory}
148148
*/
149149
public static enum KEY {
150150
/////////// Universal Parameters ///////////

0 commit comments

Comments
 (0)