Merge pull request #2831 from chetan51/issue-2830

Fix serialization of MultiEncoder
numenta · Dec 16, 2015 · 884baab · 884baab
2 parents 4257b1f + 0d1fcc0
commit 884baab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/nupic/encoders/multi.py b/src/nupic/encoders/multi.py
@@ -41,7 +41,7 @@
 # Map class to Cap'n Proto schema union attribute
 _CLASS_ATTR_MAP = {
   ScalarEncoder: "scalarEncoder",
-  AdaptiveScalarEncoder: "adaptivescalar",
+  AdaptiveScalarEncoder: "adaptiveScalarEncoder",
   DateEncoder: "dateEncoder",
   LogEncoder: "logEncoder",
   CategoryEncoder: "categoryEncoder",

diff --git a/tests/unit/nupic/encoders/multi_test.py b/tests/unit/nupic/encoders/multi_test.py
@@ -27,7 +27,7 @@
 import unittest2 as unittest
 
 from nupic.encoders.multi import MultiEncoder
-from nupic.encoders import ScalarEncoder, SDRCategoryEncoder
+from nupic.encoders import ScalarEncoder, AdaptiveScalarEncoder, SDRCategoryEncoder
 from nupic.data.dictutils import DictObj
 
 try:
@@ -101,8 +101,8 @@ def testReadWrite(self):
                                       periodic=True, name="day of week",
                                       forced=True))
     original.addEncoder("myval",
-                        ScalarEncoder(w=5, resolution=1, minval=1, maxval=10,
-                                      periodic=False, name="aux", forced=True))
+                        AdaptiveScalarEncoder(n=50, w=5, resolution=1, minval=1, maxval=10,
+                                              periodic=False, name="aux", forced=True))
     originalValue = DictObj(dow=3, myval=10)
     output = original.encode(originalValue)