update doc conf and move embedded param map to instance attribute

mengxr · Jan 27, 2015 · d5efd34 · d5efd34
1 parent f4d0fe6
commit d5efd34
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/python/docs/pyspark.ml.rst b/python/docs/pyspark.ml.rst
@@ -11,6 +11,7 @@ pyspark.ml module
     :members:
     :undoc-members:
     :show-inheritance:
+    :inherited-members:
 
 pyspark.ml.param module
 -----------------------
@@ -19,6 +20,7 @@ pyspark.ml.param module
     :members:
     :undoc-members:
     :show-inheritance:
+    :inherited-members:
 
 pyspark.ml.feature module
 -------------------------
@@ -27,12 +29,13 @@ pyspark.ml.feature module
     :members:
     :undoc-members:
     :show-inheritance:
+    :inherited-members:
 
 pyspark.ml.classification module
 --------------------------------
 
 .. automodule:: pyspark.ml.classification
     :members:
     :undoc-members:
-    :inherited-members:
     :show-inheritance:
+    :inherited-members:
diff --git a/python/pyspark/ml/param/__init__.py b/python/pyspark/ml/param/__init__.py
@@ -50,11 +50,10 @@ class Params(Identifiable):
 
     __metaclass__ = ABCMeta
 
-    #: Internal param map.
-    paramMap = {}
-
     def __init__(self):
         super(Params, self).__init__()
+        #: embedded param map
+        self.paramMap = {}
 
     def params(self):
         """
@@ -65,6 +64,6 @@ def params(self):
         return filter(lambda x: isinstance(x, Param), map(lambda x: getattr(self, x), dir(self)))
 
     def _merge_params(self, params):
-        map = self.paramMap.copy()
-        map.update(params)
-        return map
+        paramMap = self.paramMap.copy()
+        paramMap.update(params)
+        return paramMap