From eb8fcbeb8131681f0d0667086305a01d0b17f61d Mon Sep 17 00:00:00 2001 From: Manish Amde Date: Fri, 7 Mar 2014 00:45:57 -0800 Subject: [PATCH] minor code style updates --- .../apache/spark/mllib/tree/DecisionTree.scala | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala b/mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala index d57cb6dc4c91d..9cc7c494f9d64 100644 --- a/mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala +++ b/mllib/src/main/scala/org/apache/spark/mllib/tree/DecisionTree.scala @@ -17,8 +17,8 @@ package org.apache.spark.mllib.tree -import org.apache.spark.SparkContext._ import scala.util.control.Breaks._ +import org.apache.spark.SparkContext._ import org.apache.spark.rdd.RDD import org.apache.spark.mllib.tree.model._ import org.apache.spark.{SparkContext, Logging} @@ -101,7 +101,6 @@ class DecisionTree private(val strategy: Strategy) extends Serializable with Log val decisionTreeModel = { return new DecisionTreeModel(topNode, strategy.algo) } - return decisionTreeModel } @@ -538,10 +537,10 @@ object DecisionTree extends Serializable with Logging { } if (leftCount == 0) { - return new InformationGainStats(0,topImpurity,Double.MinValue,topImpurity,1) + return new InformationGainStats(0, topImpurity, Double.MinValue, topImpurity,1) } if (rightCount == 0) { - return new InformationGainStats(0,topImpurity,topImpurity,Double.MinValue,0) + return new InformationGainStats(0, topImpurity, topImpurity, Double.MinValue,0) } val leftImpurity = strategy.impurity.calculate(left0Count, left1Count) @@ -561,7 +560,7 @@ object DecisionTree extends Serializable with Logging { //val predict = leftCount / (leftCount + rightCount) val predict = (left1Count + right1Count) / (leftCount + rightCount) - new InformationGainStats(gain,impurity,leftImpurity,rightImpurity,predict) + new InformationGainStats(gain, impurity, leftImpurity, rightImpurity, predict) } case Regression => { val leftCount = leftNodeAgg(featureIndex)(3 * splitIndex) @@ -584,12 +583,12 @@ object DecisionTree extends Serializable with Logging { } if (leftCount == 0) { - return new InformationGainStats(0,topImpurity,Double.MinValue,topImpurity, + return new InformationGainStats(0, topImpurity, Double.MinValue, topImpurity, rightSum/rightCount) } if (rightCount == 0) { - return new InformationGainStats(0,topImpurity,topImpurity, - Double.MinValue,leftSum/leftCount) + return new InformationGainStats(0, topImpurity ,topImpurity, + Double.MinValue, leftSum/leftCount) } val leftImpurity = strategy.impurity.calculate(leftCount, leftSum, leftSumSquares) @@ -1024,7 +1023,4 @@ object DecisionTree extends Serializable with Logging { .mean() meanSumOfSquares } - - - }