updated __init__.py to include missing encoders (#3487)

* updated __init__.py to include missing encoders

* updated tests and refactored multi.py

* fixed base encoder import

* yep

* Fixed encoder imports after name changes

* Fixed encoder import styling.

src/nupic/encoders/__init__.py

@@ -20,6 +20,7 @@
 # ----------------------------------------------------------------------
 
 from scalar import ScalarEncoder
+from random_distributed_scalar import RandomDistributedScalarEncoder
 from adaptive_scalar import AdaptiveScalarEncoder
 from date import DateEncoder
 from logarithm import LogEncoder
@@ -29,7 +30,8 @@
 from scalar_space import ScalarSpaceEncoder
 from coordinate import CoordinateEncoder
 from geospatial_coordinate import GeospatialCoordinateEncoder
-from nupic.encoders.pass_through import PassThroughEncoder
+from pass_through import PassThroughEncoder
+from sparse_pass_through import SparsePassThroughEncoder
 # multiencoder must be imported last because it imports * from this module!
 from multi import MultiEncoder
 from utils import bitsToString

src/nupic/encoders/geospatial_coordinate.py

@@ -23,7 +23,7 @@
 
 import numpy
 from pyproj import Proj, transform
-from nupic.encoders.coordinate import CoordinateEncoder
+from nupic.encoders import CoordinateEncoder
 
 
 

src/nupic/encoders/logarithm.py

@@ -25,7 +25,7 @@
 from nupic.data import SENTINEL_VALUE_FOR_MISSING_DATA
 from nupic.data.field_meta import FieldMetaType
 from nupic.encoders.base import Encoder, EncoderResult
-from nupic.encoders.scalar import ScalarEncoder
+from nupic.encoders import ScalarEncoder
 
 
 class LogEncoder(Encoder):

src/nupic/encoders/multi.py

@@ -20,22 +20,18 @@
 # ----------------------------------------------------------------------
 
 from nupic.encoders.base import Encoder
-from nupic.encoders.scalar import ScalarEncoder
-from nupic.encoders.adaptive_scalar import AdaptiveScalarEncoder
-from nupic.encoders.date import DateEncoder
-from nupic.encoders.logarithm import LogEncoder
-from nupic.encoders.category import CategoryEncoder
-from nupic.encoders.sdr_category import SDRCategoryEncoder
-from nupic.encoders.delta import DeltaEncoder
-from nupic.encoders.scalar_space import ScalarSpaceEncoder
-from nupic.encoders.pass_through import PassThroughEncoder
-from nupic.encoders.sparse_pass_through import SparsePassThroughEncoder
-from nupic.encoders.coordinate import CoordinateEncoder
-from nupic.encoders.geospatial_coordinate import GeospatialCoordinateEncoder
-# multiencoder must be imported last because it imports * from this module!
-from nupic.encoders.utils import bitsToString
-from nupic.encoders.random_distributed_scalar import RandomDistributedScalarEncoder
-
+from nupic.encoders import (ScalarEncoder,
+                            AdaptiveScalarEncoder,
+                            DateEncoder,LogEncoder,
+                            CategoryEncoder,
+                            SDRCategoryEncoder,
+                            DeltaEncoder,
+                            ScalarSpaceEncoder,
+                            PassThroughEncoder,
+                            SparsePassThroughEncoder,
+                            CoordinateEncoder,
+                            GeospatialCoordinateEncoder,
+                            RandomDistributedScalarEncoder)
 
 
 # Map class to Cap'n Proto schema union attribute
@@ -50,13 +46,13 @@
   DeltaEncoder: "deltaEncoder",
   PassThroughEncoder: "passThroughEncoder",
   SparsePassThroughEncoder: "sparsePassThroughEncoder",
+  GeospatialCoordinateEncoder: "geospatialCoordinateEncoder",
+  ScalarSpaceEncoder: "scalarSpaceEncoder",
   RandomDistributedScalarEncoder: "randomDistributedScalarEncoder"
 }
 
 # Invert for fast lookup in MultiEncoder.read()
-_ATTR_CLASS_MAP = {value:key for key, value in _CLASS_ATTR_MAP.items()}
-
-
+_ATTR_CLASS_MAP = {value: key for key, value in _CLASS_ATTR_MAP.items()}
 
 
 class MultiEncoder(Encoder):

src/nupic/encoders/scalar_space.py

@@ -19,8 +19,8 @@
 # http://numenta.org/licenses/
 # ----------------------------------------------------------------------
 from nupic.encoders.base import Encoder
-from nupic.encoders.delta import DeltaEncoder
-from nupic.encoders.adaptive_scalar import AdaptiveScalarEncoder
+from nupic.encoders import (DeltaEncoder,
+                            AdaptiveScalarEncoder)
 
 
 class ScalarSpaceEncoder(Encoder):

tests/unit/nupic/encoders/pass_through_encoder_test.py

@@ -28,7 +28,7 @@
 
 import numpy
 
-from nupic.encoders.pass_through import PassThroughEncoder
+from nupic.encoders import PassThroughEncoder
 
 try:
   import capnp

tests/unit/nupic/encoders/random_distributed_scalar_test.py

@@ -29,9 +29,7 @@
 from nupic.data import SENTINEL_VALUE_FOR_MISSING_DATA
 from nupic.data.field_meta import FieldMetaType
 from nupic.support.unittesthelpers.algorithm_test_helpers import getSeed
-from nupic.encoders.random_distributed_scalar import (
-  RandomDistributedScalarEncoder
-)
+from nupic.encoders import RandomDistributedScalarEncoder
 
 try:
   import capnp

tests/unit/nupic/encoders/sparse_pass_through_encoder_test.py

@@ -28,7 +28,7 @@
 
 import numpy
 
-from nupic.encoders.sparse_pass_through import SparsePassThroughEncoder
+from nupic.encoders import SparsePassThroughEncoder
 
 
 try: