make params a property

zapletal-martin · Jan 27, 2015 · f66ba0c · f66ba0c
1 parent d5efd34
commit f66ba0c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/python/pyspark/ml/__init__.py b/python/pyspark/ml/__init__.py
@@ -221,7 +221,7 @@ def _transfer_params_to_java(self, params, java_obj):
         :param java_obj: Java object to receive the params
         """
         paramMap = self._merge_params(params)
-        for param in self.params():
+        for param in self.params:
             if param in paramMap:
                 java_obj.set(param.name, paramMap[param])
 

diff --git a/python/pyspark/ml/param/__init__.py b/python/pyspark/ml/param/__init__.py
@@ -55,13 +55,15 @@ def __init__(self):
         #: embedded param map
         self.paramMap = {}
 
+    @property
     def params(self):
         """
         Returns all params. The default implementation uses
         :py:func:`dir` to get all attributes of type
         :py:class:`Param`.
         """
-        return filter(lambda x: isinstance(x, Param), map(lambda x: getattr(self, x), dir(self)))
+        return filter(lambda attr: isinstance(attr, Param),
+                      [getattr(self, x) for x in dir(self) if x != "params"])
 
     def _merge_params(self, params):
         paramMap = self.paramMap.copy()