Skip to content
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

[SPARK-8525][MLLIB] fix LabeledPoint parser when there is a whitespace between label and features vector #6954

Closed
wants to merge 2 commits into from
+14 −0
Closed

[SPARK-8525][MLLIB] fix LabeledPoint parser when there is a whitespace between label and features vector #6954

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1abc2b
[SPARK-8525][MLLIB] fix LabeledPoint parser when there is a whitespac…
fe2s Jun 23, 2015
0755b9d
[SPARK-8525][MLLIB] addressing comment, removing dep on commons-lang
fe2s Jun 23, 2015
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
4 changes: 4 additions & 0 deletions mllib/src/main/scala/org/apache/spark/mllib/util/NumericParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package org.apache.spark.mllib.util

import java.util.StringTokenizer

import org.apache.commons.lang.StringUtils.isBlank
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't use commons-lang -- it's not actually a dependency. I wouldn't even use lang3. You don't need a utility class for something this simple


import scala.collection.mutable.{ArrayBuilder, ListBuffer}

import org.apache.spark.SparkException
Expand Down Expand Up @@ -98,6 +100,8 @@ private[mllib] object NumericParser {
}
} else if (token == ")") {
parsing = false
} else if (isBlank(token)){
// ignore whitespaces between delim chars, e.g. ", ["
} else {
// expecting a number
items.append(parseDouble(token))
Expand Down
5 changes: 5 additions & 0 deletions mllib/src/test/scala/org/apache/spark/mllib/regression/LabeledPointSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ class LabeledPointSuite extends SparkFunSuite {
}
}

test("parse labeled points with whitespaces") {
val point = LabeledPoint.parse("(0.0, [1.0, 2.0])")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, doesn't this still yield " 2.0" as a token during parsing? which wouldn't parse I'd imagine. Does this pass? in which case I'm missing something ...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When it comes to java.lang.Double.parseDouble(s) it ignores spaces.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, interesting. Sounds good.

assert(point === LabeledPoint(0.0, Vectors.dense(1.0, 2.0)))
}

test("parse labeled points with v0.9 format") {
val point = LabeledPoint.parse("1.0,1.0 0.0 -2.0")
assert(point === LabeledPoint(1.0, Vectors.dense(1.0, 0.0, -2.0)))
Expand Down
7 changes: 7 additions & 0 deletions mllib/src/test/scala/org/apache/spark/mllib/util/NumericParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,11 @@ class NumericParserSuite extends SparkFunSuite {
}
}
}

test("parser with whitespaces") {
val s = "(0.0, [1.0, 2.0])"
val parsed = NumericParser.parse(s).asInstanceOf[Seq[_]]
assert(parsed(0).asInstanceOf[Double] === 0.0)
assert(parsed(1).asInstanceOf[Array[Double]] === Array(1.0, 2.0))
}
}