You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/04/26 13:14:30 UTC
spark git commit: [MINOR] [MLLIB] Refactor toString method in MLLIB
Repository: spark
Updated Branches:
refs/heads/master f5473c2bb -> 9a5bbe05f
[MINOR] [MLLIB] Refactor toString method in MLLIB
1. predict(predict.toString) has already output prefix “predict” thus it’s duplicated to print ", predict = " again
2. there are some extra spaces
Author: Alain <ai...@usc.edu>
Closes #5687 from AiHe/tree-node-issue-2 and squashes the following commits:
9862b9a [Alain] Pass scala coding style checking
44ba947 [Alain] Minor][MLLIB] Format toString method in MLLIB
bdc402f [Alain] [Minor][MLLIB] Fix a formatting bug in toString method in Node
426eee7 [Alain] [Minor][MLLIB] Fix a formatting bug in toString method in Node.scala
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9a5bbe05
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9a5bbe05
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9a5bbe05
Branch: refs/heads/master
Commit: 9a5bbe05fc1b1141e139d32661821fef47d7a13c
Parents: f5473c2
Author: Alain <ai...@usc.edu>
Authored: Sun Apr 26 07:14:24 2015 -0400
Committer: Sean Owen <so...@cloudera.com>
Committed: Sun Apr 26 07:14:24 2015 -0400
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala | 2 +-
.../scala/org/apache/spark/mllib/regression/LabeledPoint.scala | 2 +-
.../apache/spark/mllib/tree/model/InformationGainStats.scala | 4 ++--
.../src/main/scala/org/apache/spark/mllib/tree/model/Node.scala | 4 ++--
.../main/scala/org/apache/spark/mllib/tree/model/Predict.scala | 4 +---
.../main/scala/org/apache/spark/mllib/tree/model/Split.scala | 5 ++---
6 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9a5bbe05/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
index 4ef171f..166c00c 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/linalg/Vectors.scala
@@ -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)
http://git-wip-us.apache.org/repos/asf/spark/blob/9a5bbe05/mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala b/mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala
index 2067b36..d5fea82 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/regression/LabeledPoint.scala
@@ -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)"
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/9a5bbe05/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala
index f209fda..2d087c9 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/InformationGainStats.scala
@@ -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 {
http://git-wip-us.apache.org/repos/asf/spark/blob/9a5bbe05/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
index 86390a2..431a839 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Node.scala
@@ -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, " +
+ s"split = $split, stats = $stats"
}
/**
http://git-wip-us.apache.org/repos/asf/spark/blob/9a5bbe05/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Predict.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Predict.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Predict.scala
index 25990af..5cbe7c2 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Predict.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Predict.scala
@@ -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 {
http://git-wip-us.apache.org/repos/asf/spark/blob/9a5bbe05/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Split.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Split.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Split.scala
index fb35e70..be6c9b3 100644
--- a/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Split.scala
+++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/model/Split.scala
@@ -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"
}
}
@@ -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())
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org