Skip to content

[SPARK-13047][PYSPARK][ML] Pyspark Params.hasParam should not throw an error #10962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sethah wants to merge 5 commits into from
Closed

[SPARK-13047][PYSPARK][ML] Pyspark Params.hasParam should not throw an error #10962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d52b1de
hasParam returns False instead of throwing an error
sethah Jan 27, 2016
2989f93
hasParam accepts only string types
sethah Jan 28, 2016
a1b885c
add test and note in doc
sethah Jan 28, 2016
8dc7d05
removing None check in hasParam
sethah Feb 5, 2016
6581575
removing note in docstring
sethah Feb 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions python/pyspark/ml/param/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,11 @@ def hasParam(self, paramName):
Tests whether this instance contains a param with a given
(string) name.
"""
param = self._resolveParam(paramName)
return param in self.params
if isinstance(paramName, str):
p = getattr(self, paramName, None)
return isinstance(p, Param)
else:
raise TypeError("hasParam(): paramName must be a string")

@since("1.4.0")
def getOrDefault(self, param):
Expand Down
9 changes: 7 additions & 2 deletions python/pyspark/ml/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,11 @@ def test_param(self):
self.assertEqual(maxIter.doc, "max number of iterations (>= 0).")
self.assertTrue(maxIter.parent == testParams.uid)

def test_hasparam(self):
testParams = TestParams()
self.assertTrue(all([testParams.hasParam(p.name) for p in testParams.params]))
self.assertFalse(testParams.hasParam("notAParameter"))

def test_params(self):
testParams = TestParams()
maxIter = testParams.maxIter
Expand All @@ -201,7 +206,7 @@ def test_params(self):
params = testParams.params
self.assertEqual(params, [inputCol, maxIter, seed])

self.assertTrue(testParams.hasParam(maxIter))
self.assertTrue(testParams.hasParam(maxIter.name))
self.assertTrue(testParams.hasDefault(maxIter))
self.assertFalse(testParams.isSet(maxIter))
self.assertTrue(testParams.isDefined(maxIter))
Expand All @@ -210,7 +215,7 @@ def test_params(self):
self.assertTrue(testParams.isSet(maxIter))
self.assertEqual(testParams.getMaxIter(), 100)

self.assertTrue(testParams.hasParam(inputCol))
self.assertTrue(testParams.hasParam(inputCol.name))
self.assertFalse(testParams.hasDefault(inputCol))
self.assertFalse(testParams.isSet(inputCol))
self.assertFalse(testParams.isDefined(inputCol))
Expand Down