Skip to content

[Minor][MLLIB] Refactor toString method in MLLIB #5687

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

[Minor][MLLIB] Refactor toString method in MLLIB #5687

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
426eee7
[Minor][MLLIB] Fix a formatting bug in toString method in Node.scala
Apr 24, 2015
bdc402f
[Minor][MLLIB] Fix a formatting bug in toString method in Node
Apr 24, 2015
44ba947
Minor][MLLIB] Format toString method in MLLIB
Apr 25, 2015
9862b9a
Pass scala coding style checking
Apr 26, 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
2 changes: 1 addition & 1 deletion mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ class SparseVector(
s" ${values.size} values.")

override def toString: String =
"(%s,%s,%s)".format(size, indices.mkString("[", ",", "]"), values.mkString("[", ",", "]"))
s"($size,${indices.mkString("[", ",", "]")},${values.mkString("[", ",", "]")})"

override def toArray: Array[Double] = {
val data = new Array[Double](size)
Expand Down
2 changes: 1 addition & 1 deletion mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.apache.spark.SparkException
@BeanInfo
case class LabeledPoint(label: Double, features: Vector) {
override def toString: String = {
"(%s,%s)".format(label, features)
s"($label,$features)"
}
}

Expand Down
4 changes: 2 additions & 2 deletions mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class InformationGainStats(
val rightPredict: Predict) extends Serializable {

override def toString: String = {
"gain = %f, impurity = %f, left impurity = %f, right impurity = %f"
.format(gain, impurity, leftImpurity, rightImpurity)
s"gain = $gain, impurity = $impurity, left impurity = $leftImpurity, " +
s"right impurity = $rightImpurity"
}

override def equals(o: Any): Boolean = o match {
Expand Down
4 changes: 2 additions & 2 deletions mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class Node (
var stats: Option[InformationGainStats]) extends Serializable with Logging {

override def toString: String = {
"id = " + id + ", isLeaf = " + isLeaf + ", predict = " + predict + ", " +
"impurity = " + impurity + ", split = " + split + ", stats = " + stats
s"id = $id, isLeaf = $isLeaf, predict = $predict, impurity = $impurity, " +
Copy link
Member

@srowen srowen Apr 24, 2015

Choose a reason for hiding this comment

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

These can use string interpolation. I take your point though it breaks the symmetry a bit and make this toString rely on details of the subclass. How about making the Predict.toString return something more compact like s"$predict ($prob)"?

s"split = $split, stats = $stats"
}

/**
Expand Down
4 changes: 1 addition & 3 deletions mllib/src/main/scala/org/apache/spark/mllib/tree/model/Predict.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ class Predict(
val predict: Double,
val prob: Double = 0.0) extends Serializable {

override def toString: String = {
"predict = %f, prob = %f".format(predict, prob)
}
override def toString: String = s"$predict (prob = $prob)"

override def equals(other: Any): Boolean = {
other match {
Expand Down
5 changes: 2 additions & 3 deletions mllib/src/main/scala/org/apache/spark/mllib/tree/model/Split.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ case class Split(
categories: List[Double]) {

override def toString: String = {
"Feature = " + feature + ", threshold = " + threshold + ", featureType = " + featureType +
", categories = " + categories
s"Feature = $feature, threshold = $threshold, featureType = $featureType, " +
s"categories = $categories"
}
}

Expand Down Expand Up @@ -68,4 +68,3 @@ private[tree] class DummyHighSplit(feature: Int, featureType: FeatureType)
*/
private[tree] class DummyCategoricalSplit(feature: Int, featureType: FeatureType)
extends Split(feature, Double.MaxValue, featureType, List())