Add __setstate__() to bootstrap old checkpoints

MANIFEST.in

@@ -13,4 +13,3 @@ recursive-include external/linux64 swig *.a
 
 recursive-include nupic/datafiles *.csv *.txt
 recursive-include *.capnp
-

nupic/encoders/random_distributed_scalar.py

@@ -22,8 +22,8 @@
 import math
 import numbers
 import pprint
+import sys
 
-import capnp
 import numpy
 
 from nupic.data import SENTINEL_VALUE_FOR_MISSING_DATA
@@ -160,6 +160,16 @@ def __init__(self, resolution, w=21, n=400, name=None, offset=None,
       self.dump()
 
 
+  def __setstate__(self, state):
+    self.__dict__.update(state)
+
+    # Initialize self.random as an instance of NupicRandom derived from the
+    # previous numpy random state
+    randomState = state["random"]
+    if isinstance(randomState, numpy.random.mtrand.RandomState):
+      self.random = NupicRandom(randomState.randint(sys.maxint))
+
+
   def _seed(self, seed=-1):
     """
     Initialize the random seed
@@ -480,5 +490,3 @@ def write(self, proto):
     proto.maxIndex = self.maxIndex
     proto.bucketMap = [{"key": key, "value": value.tolist()}
                        for key, value in self.bucketMap.items()]
-
-

tests/unit/nupic/encoders/random_distributed_scalar_test.py

@@ -438,7 +438,7 @@ def testEncodeInvalidInputType(self):
 
   def testCapNProtoSerialization(self):
     original = RandomDistributedScalarEncoder(name="enc", resolution=1.0, w=23,
-                                              n=500, offset = 0.0)
+                                              n=500, offset=0.0)
 
     originalValue = original.encode(1)