Skip to content

[SPARK-14739][PYTHON][ML] #12511

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
zero323 wants to merge 4 commits into from
Closed

[SPARK-14739][PYTHON][ML] #12511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0433338
Add tests for SPARK-14739
Apr 19, 2016
6e50f77
Fix pre-existing tests
Apr 20, 2016
f46da1b
Fix parsing for empty DenseVector
Apr 19, 2016
fb8e615
Fix parsing of an empty SparseVector
Apr 19, 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: 4 additions & 3 deletions python/pyspark/mllib/linalg/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def parse(s):
s = s[start + 1: end]

try:
values = [float(val) for val in s.split(',')]
values = [float(val) for val in s.split(',')] if s else []
except ValueError:
raise ValueError("Unable to parse values from %s" % s)
return DenseVector(values)
Expand Down Expand Up @@ -584,7 +584,7 @@ def parse(s):
if ind_end == -1:
raise ValueError("Indices array should end with ']'")
new_s = s[ind_start + 1: ind_end]
ind_list = new_s.split(',')
ind_list = new_s.split(',') if new_s else []
try:
indices = [int(ind) for ind in ind_list]
except ValueError:
Expand All @@ -597,7 +597,8 @@ def parse(s):
val_end = s.find(']')
if val_end == -1:
raise ValueError("Values array should end with ']'.")
val_list = s[val_start + 1: val_end].split(',')
val_s = s[val_start + 1: val_end]
val_list = val_s.split(',') if val_s else []
try:
values = [float(val) for val in val_list]
except ValueError:
Expand Down
14 changes: 9 additions & 5 deletions python/pyspark/mllib/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,13 +394,17 @@ def test_dense_matrix_is_transposed(self):

def test_parse_vector(self):
a = DenseVector([3, 4, 6, 7])
self.assertTrue(str(a), '[3.0,4.0,6.0,7.0]')
self.assertTrue(Vectors.parse(str(a)), a)
self.assertEqual(str(a), '[3.0,4.0,6.0,7.0]')
self.assertEqual(Vectors.parse(str(a)), a)
a = SparseVector(4, [0, 2], [3, 4])
self.assertTrue(str(a), '(4,[0,2],[3.0,4.0])')
self.assertTrue(Vectors.parse(str(a)), a)
self.assertEqual(str(a), '(4,[0,2],[3.0,4.0])')
self.assertEqual(Vectors.parse(str(a)), a)
a = SparseVector(10, [0, 1], [4, 5])
self.assertTrue(SparseVector.parse(' (10, [0,1 ],[ 4.0,5.0] )'), a)
self.assertEqual(SparseVector.parse(' (10, [0,1 ],[ 4.0,5.0] )'), a)
a = DenseVector([])
self.assertEqual(Vectors.parse('[]'), a)
a = SparseVector(10, [], [])
self.assertEqual(Vectors.parse('(10, [], [])'), a)

def test_norms(self):
a = DenseVector([0, 2, 3, -1])
Expand Down