numenta/htm.java — pull request #105 by solovyevk (2014-11-09 00:44:38+00:00)
Title: Parameters finalized

#97 Is done here

Had merging conflicts:

Conflicts:
src/main/java/org/numenta/nupic/Parameters.java
src/test/java/org/numenta/nupic/integration/AbstractTemporalMemoryTest.java
src/test/java/org/numenta/nupic/integration/BasicTemporalMemoryTest.java
src/test/java/org/numenta/nupic/integration/ExtensiveTemporalMemoryTest.java
src/test/java/org/numenta/nupic/unit/encoders/CategoryEncoderTest.java
src/test/java/org/numenta/nupic/unit/encoders/ScalarEncoderTest.java
src/test/java/org/numenta/nupic/unit/research/SpatialPoolerTest.java

I manually merged Parameters.java and overwite my changes with yours for the Tests