Add capnp serialization to CLAClassifierRegion

src/nupic/algorithms/cla_classifier_factory.py

@@ -46,3 +46,22 @@ def create(*args, **kwargs):
     else:
       raise ValueError('Invalid classifier implementation (%r). Value must be '
                        '"py" or "cpp".' % impl)
+
+
+  @staticmethod
+  def read(proto):
+    """
+    proto: CLAClassifierRegionProto capnproto object
+    """
+    impl = proto.classifierImp
+    if impl == 'py':
+      return CLAClassifier.read(proto.claClassifier)
+    elif impl == 'cpp':
+      instance = FastCLAClassifier()
+      instance.read(proto.claClassifier)
+      return instance
+    elif impl == 'diff':
+      raise NotImplementedError("CLAClassifierDiff.read not implemented")
+    else:
+      raise ValueError('Invalid classifier implementation (%r). Value must be '
+                       '"py" or "cpp".' % impl)

src/nupic/regions/CLAClassifierRegion.capnp

@@ -0,0 +1,13 @@
+@0x86ee045dcbcfbf3f;
+
+using import "/nupic/proto/ClaClassifier.capnp".ClaClassifierProto;
+
+# Next ID: 6
+struct CLAClassifierRegionProto {
+  classifierImp @0 :Text;
+  claClassifier @1 :ClaClassifierProto;
+  steps @2 :Text;
+  alpha @3 :Float32;
+  verbosity @4 :UInt32;
+  maxCategoryCount @5 :UInt32;
+}

src/nupic/regions/CLAClassifierRegion.py

@@ -28,7 +28,16 @@
 import warnings
 
 from nupic.bindings.regions.PyRegion import PyRegion
+from nupic.bindings.algorithms import FastCLAClassifier
 from nupic.algorithms.cla_classifier_factory import CLAClassifierFactory
+from nupic.support.configuration import Configuration
+
+try:
+  import capnp
+except ImportError:
+  capnp = None
+if capnp:
+  from nupic.regions.CLAClassifierRegion_capnp import CLAClassifierRegionProto
 
 
 
@@ -198,7 +207,12 @@ def __init__(self,
                maxCategoryCount=None
                ):
 
+    # Set default implementation
+    if implementation is None:
+      implementation = Configuration.get('nupic.opf.claClassifier.implementation')
+
     # Convert the steps designation to a list
+    self.classifierImp = implementation
     self.steps = steps
     self.stepsList = eval("[%s]" % (steps))
     self.alpha = alpha
@@ -270,6 +284,43 @@ def setParameter(self, name, index, value):
       return PyRegion.setParameter(self, name, index, value)
 
 
+  def write(self, proto):
+    """Write state to proto object.
+
+    proto: PyRegionProto capnproto object
+    """
+    regionImpl = proto.regionImpl.as_struct(CLAClassifierRegionProto)
+
+    regionImpl.classifierImp = self.classifierImp
+    regionImpl.steps = self.steps
+    regionImpl.alpha = self.alpha
+    regionImpl.verbosity = self.verbosity
+    regionImpl.maxCategoryCount = self.maxCategoryCount
+
+    self._claClassifier.write(regionImpl.claClassifier)
+
+
+  @classmethod
+  def read(cls, proto):
+    """Read state from proto object.
+
+    proto: PyRegionProto capnproto object
+    """
+    regionImpl = proto.regionImpl.as_struct(CLAClassifierRegionProto)
+
+    instance = cls()
+
+    instance.classifierImp = regionImpl.classifierImp
+    instance.steps = regionImpl.steps
+    instance.alpha = regionImpl.alpha
+    instance.verbosity = regionImpl.verbosity
+    instance.maxCategoryCount = regionImpl.maxCategoryCount
+
+    instance._claClassifier = CLAClassifierFactory.read(regionImpl)
+
+    return instance
+
+
   def reset(self):
     pass