Repository: mahout Updated Branches: refs/heads/master e8b9c8003 -> f6224fcf7
NoJIRA: scala code cleanup from the previous commits Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/f6224fcf Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/f6224fcf Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/f6224fcf Branch: refs/heads/master Commit: f6224fcf7e3dc2cfdf086c553e6b7f3e872263aa Parents: e8b9c80 Author: smarthi <[email protected]> Authored: Tue Mar 8 01:21:06 2016 -0500 Committer: smarthi <[email protected]> Committed: Tue Mar 8 11:38:37 2016 -0500 ---------------------------------------------------------------------- .../classifier/naivebayes/NBClassifier.scala | 6 +++--- .../mahout/classifier/naivebayes/NBModel.scala | 2 -- .../classifier/naivebayes/NaiveBayes.scala | 10 +++++----- .../classifier/stats/ConfusionMatrix.scala | 15 +++++++-------- .../apache/mahout/math/decompositions/ALS.scala | 2 -- .../apache/mahout/math/decompositions/DQR.scala | 2 -- .../mahout/math/decompositions/DSPCA.scala | 1 - .../mahout/math/decompositions/DSSVD.scala | 1 - .../apache/mahout/math/drm/CheckpointedOps.scala | 1 - .../mahout/math/drm/DistributedEngine.scala | 4 ++-- .../mahout/math/scalabindings/MatrixOps.scala | 19 ++++++++++--------- .../math/scalabindings/RLikeVectorOps.scala | 2 +- .../mahout/math/scalabindings/VectorOps.scala | 2 +- .../apache/mahout/sparkbindings/blas/ABt.scala | 3 --- 14 files changed, 29 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBClassifier.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBClassifier.scala b/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBClassifier.scala index 5de0733..6f8ecb3 100644 --- a/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBClassifier.scala +++ b/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBClassifier.scala @@ -91,7 +91,7 @@ object StandardNBClassifier extends java.io.Serializable { def computeWeight(featureLabelWeight: Double, labelWeight: Double, alphaI: Double, numFeatures: Double): Double = { val numerator: Double = featureLabelWeight + alphaI val denominator: Double = labelWeight + alphaI * numFeatures - return Math.log(numerator / denominator) + Math.log(numerator / denominator) } } @@ -103,7 +103,7 @@ class ComplementaryNBClassifier(nbModel: NBModel) extends AbstractNBClassifier(n override def getScoreForLabelFeature(label: Int, feature: Int): Double = { val model: NBModel = getModel val weight: Double = ComplementaryNBClassifier.computeWeight(model.featureWeight(feature), model.weight(label, feature), model.totalWeightSum, model.labelWeight(label), model.alphaI, model.numFeatures) - return weight / model.thetaNormalizer(label) + weight / model.thetaNormalizer(label) } } @@ -114,6 +114,6 @@ object ComplementaryNBClassifier extends java.io.Serializable { def computeWeight(featureWeight: Double, featureLabelWeight: Double, totalWeight: Double, labelWeight: Double, alphaI: Double, numFeatures: Double): Double = { val numerator: Double = featureWeight - featureLabelWeight + alphaI val denominator: Double = totalWeight - labelWeight + alphaI * numFeatures - return -Math.log(numerator / denominator) + -Math.log(numerator / denominator) } } http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBModel.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBModel.scala b/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBModel.scala index 3ceae96..c4afe4f 100644 --- a/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBModel.scala +++ b/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NBModel.scala @@ -22,9 +22,7 @@ import org.apache.mahout.math.{drm, scalabindings} import scalabindings._ import scalabindings.RLikeOps._ -import drm.RLikeDrmOps._ import drm._ -import scala.collection.JavaConverters._ import scala.language.asInstanceOf import scala.collection._ import JavaConversions._ http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NaiveBayes.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NaiveBayes.scala b/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NaiveBayes.scala index 5a17144..36fc551 100644 --- a/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NaiveBayes.scala +++ b/math-scala/src/main/scala/org/apache/mahout/classifier/naivebayes/NaiveBayes.scala @@ -150,7 +150,7 @@ trait NaiveBayes extends java.io.Serializable{ val inCoreIntKeyedObservations = new SparseMatrix( stringKeyedObservations.nrow.toInt, stringKeyedObservations.ncol) - for (i <- 0 until inCoreStringKeyedObservations.nrow.toInt) { + for (i <- 0 until inCoreStringKeyedObservations.nrow) { inCoreIntKeyedObservations(i, ::) = inCoreStringKeyedObservations(i, ::) } @@ -165,8 +165,8 @@ trait NaiveBayes extends java.io.Serializable{ // Encode Categories as an Integer (Double) so we can broadcast as a vector // where each element is an Int-encoded category whose index corresponds // to its row in the Drm - for (i <- 0 until labelVectorByRowIndex.size) { - if (!(labelIndexMap.contains(labelVectorByRowIndex(i)._2))) { + for (i <- labelVectorByRowIndex.indices) { + if (!labelIndexMap.contains(labelVectorByRowIndex(i)._2)) { encodedLabelByRowIndexVector(i) = labelIndex.toDouble labelIndexMap.put(labelVectorByRowIndex(i)._2, labelIndex) labelIndex += 1 @@ -287,7 +287,7 @@ trait NaiveBayes extends java.io.Serializable{ */ def argmax(v: Vector): (Int, Double) = { var bestIdx: Int = Integer.MIN_VALUE - var bestScore: Double = Integer.MIN_VALUE.asInstanceOf[Int].toDouble + var bestScore: Double = Integer.MIN_VALUE.toDouble for(i <- 0 until v.size) { if(v(i) > bestScore){ bestScore = v(i) @@ -316,7 +316,7 @@ class ComplementaryNBThetaTrainer(private val weightsPerFeature: Vector, private val perLabelThetaNormalizer: Vector = weightsPerLabel.like() private val totalWeightSum: Double = weightsPerLabel.zSum - private var numFeatures: Double = weightsPerFeature.getNumNondefaultElements + private val numFeatures: Double = weightsPerFeature.getNumNondefaultElements assert(weightsPerFeature != null, "weightsPerFeature vector can not be null") assert(weightsPerLabel != null, "weightsPerLabel vector can not be null") http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/classifier/stats/ConfusionMatrix.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/classifier/stats/ConfusionMatrix.scala b/math-scala/src/main/scala/org/apache/mahout/classifier/stats/ConfusionMatrix.scala index 328d27b..d421fa1 100644 --- a/math-scala/src/main/scala/org/apache/mahout/classifier/stats/ConfusionMatrix.scala +++ b/math-scala/src/main/scala/org/apache/mahout/classifier/stats/ConfusionMatrix.scala @@ -41,7 +41,6 @@ class ConfusionMatrix(private var labels: util.Collection[String] = null, private var defaultLabel: String = "unknown") { /** * Matrix Constructor - * @param m a DenseMatrix with RowLabelBindings */ // def this(m: Matrix) { // this() @@ -124,7 +123,7 @@ class ConfusionMatrix(private var labels: util.Collection[String] = null, if (truePositives + falsePositives == 0) { 0 } else { - (truePositives.asInstanceOf[Double]) / (truePositives + falsePositives) + truePositives.asInstanceOf[Double] / (truePositives + falsePositives) } } @@ -154,7 +153,7 @@ class ConfusionMatrix(private var labels: util.Collection[String] = null, if (truePositives + falseNegatives == 0) { 0 } else { - (truePositives.asInstanceOf[Double]) / (truePositives + falseNegatives) + truePositives.asInstanceOf[Double] / (truePositives + falseNegatives) } } @@ -218,10 +217,10 @@ class ConfusionMatrix(private var labels: util.Collection[String] = null, def getKappa: Double = { var a: Double = 0.0 var b: Double = 0.0 - for (i <- 0 until confusionMatrix.length) { + for (i <- confusionMatrix.indices) { a += confusionMatrix(i)(i) var br: Int = 0 - for (j <- 0 until confusionMatrix.length) { + for (j <- confusionMatrix.indices) { br += confusionMatrix(i)(j) } var bc: Int = 0 @@ -255,9 +254,9 @@ class ConfusionMatrix(private var labels: util.Collection[String] = null, */ def getNormalizedStats: RunningAverageAndStdDev = { val summer = new FullRunningAverageAndStdDev() - for (d <- 0 until confusionMatrix.length) { + for (d <- confusionMatrix.indices) { var total: Double = 0.0 - for (j <- 0 until confusionMatrix.length) { + for (j <- confusionMatrix.indices) { total += confusionMatrix(d)(j) } summer.addDatum(confusionMatrix(d)(d) / (total + 0.000001)) @@ -374,7 +373,7 @@ class ConfusionMatrix(private var labels: util.Collection[String] = null, assert(sorted.length == length, "One label, one row") for (i <- 0 until length) { if (sorted(i) == null) { - assert(false, "One label, one row") + assert(assertion = false, "One label, one row") } } } http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/decompositions/ALS.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/decompositions/ALS.scala b/math-scala/src/main/scala/org/apache/mahout/math/decompositions/ALS.scala index 92d0e12..8ced112 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/decompositions/ALS.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/decompositions/ALS.scala @@ -17,13 +17,11 @@ package org.apache.mahout.math.decompositions -import scala.reflect.ClassTag import org.apache.mahout.math._ import drm._ import scalabindings._ import RLikeDrmOps._ import RLikeOps._ -import scala.util.Random import org.apache.log4j.Logger import math._ import org.apache.mahout.common.RandomUtils http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DQR.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DQR.scala b/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DQR.scala index 9173d09..4a7681a 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DQR.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DQR.scala @@ -17,14 +17,12 @@ package org.apache.mahout.math.decompositions -import scala.reflect.ClassTag import org.apache.mahout.logging._ import org.apache.mahout.math.Matrix import org.apache.mahout.math.scalabindings._ import RLikeOps._ import org.apache.mahout.math.drm._ import RLikeDrmOps._ -import org.apache.log4j.Logger object DQR { http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSPCA.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSPCA.scala b/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSPCA.scala index 4a769b9..78cfb8b 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSPCA.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSPCA.scala @@ -17,7 +17,6 @@ package org.apache.mahout.math.decompositions -import scala.reflect.ClassTag import org.apache.mahout.math.{Matrices, Vector} import org.apache.mahout.math.scalabindings._ import RLikeOps._ http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSSVD.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSSVD.scala b/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSSVD.scala index acd1dc1..4b65ef4 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSSVD.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/decompositions/DSSVD.scala @@ -1,6 +1,5 @@ package org.apache.mahout.math.decompositions -import scala.reflect.ClassTag import org.apache.mahout.math.{Matrix, Matrices, Vector} import org.apache.mahout.math.scalabindings._ import RLikeOps._ http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala index da8ce9f..d44e8fc 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala @@ -17,7 +17,6 @@ package org.apache.mahout.math.drm -import scala.reflect.ClassTag import org.apache.mahout.math._ import org.apache.mahout.math.scalabindings.RLikeOps._ http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala index ed93d89..f4d209e 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala @@ -169,7 +169,7 @@ object DistributedEngine { OpAt(OpTimesRightMatrix(A = OpAt(pass1(b)), right = a.t)) // Add vertical row index concatenation for rbind() on DrmLike[Int] fragments - case op@OpRbind(a, b) if (op.keyClassTag == ClassTag.Int) â + case op@OpRbind(a, b) if op.keyClassTag == ClassTag.Int â // Make sure closure sees only local vals, not attributes. We need to do these ugly casts // around because compiler could not infer that K is the same as Int, based on if() above. @@ -236,7 +236,7 @@ object DistributedEngine { case OpAB(a, OpAt(b)) â OpABt(pass3(a), pass3(b)) // AtB cases that make sense. - case OpAB(OpAt(a), b) if (a.partitioningTag == b.partitioningTag) â OpAtB(pass3(a), pass3(b)) + case OpAB(OpAt(a), b) if a.partitioningTag == b.partitioningTag â OpAtB(pass3(a), pass3(b)) case OpABAnyKey(OpAtAnyKey(a), b) â OpAtB(pass3(a), pass3(b)) // Need some cost to choose between the following. http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/MatrixOps.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/MatrixOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/MatrixOps.scala index 3c0ae89..cb92e1d 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/MatrixOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/MatrixOps.scala @@ -18,10 +18,11 @@ package org.apache.mahout.math.scalabindings import org.apache.mahout.math.flavor.TraversingStructureEnum -import org.apache.mahout.math.{Matrices, QRDecomposition, Vector, Matrix} -import collection._ -import JavaConversions._ -import org.apache.mahout.math.function.{DoubleDoubleFunction, VectorFunction, DoubleFunction, Functions} +import org.apache.mahout.math.function.{DoubleFunction, Functions, VectorFunction} +import org.apache.mahout.math.{Matrices, Matrix, QRDecomposition, Vector} + +import scala.collection.JavaConversions._ +import scala.collection._ import scala.math._ class MatrixOps(val m: Matrix) { @@ -83,7 +84,7 @@ class MatrixOps(val m: Matrix) { def apply(row: Int, col: Int) = m.get(row, col) def update(row: Int, col: Int, that: Double): Matrix = { - m.setQuick(row, col, that); + m.setQuick(row, col, that) m } @@ -105,12 +106,12 @@ class MatrixOps(val m: Matrix) { if (rowRange == :: && colRange == ::) return m - val rr = if (rowRange == ::) (0 until m.nrow) + val rr = if (rowRange == ::) 0 until m.nrow else rowRange - val cr = if (colRange == ::) (0 until m.ncol) + val cr = if (colRange == ::) 0 until m.ncol else colRange - return m.viewPart(rr.start, rr.length, cr.start, cr.length) + m.viewPart(rr.start, rr.length, cr.start, cr.length) } @@ -142,7 +143,7 @@ class MatrixOps(val m: Matrix) { /** * Assigning from a row-wise collection of vectors - * @param that + * @param that - */ def :=(that: TraversableOnce[Vector]) = { var row = 0 http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala index 3a64351..394795f 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/RLikeVectorOps.scala @@ -17,7 +17,7 @@ package org.apache.mahout.math.scalabindings -import org.apache.mahout.math.{Matrix, Vector} +import org.apache.mahout.math.Vector import org.apache.mahout.math.function.Functions import RLikeOps._ http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala index de1a954..30311b8 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/scalabindings/VectorOps.scala @@ -140,7 +140,7 @@ class VectorOps(private[scalabindings] val v: Vector) { import RLikeOps._ v match { - case vd: Vector if (vd.isDense) => dense(vd).t + case vd: Vector if vd.isDense => dense(vd).t case srsv: RandomAccessSparseVector => new SparseColumnMatrix(srsv.length, 1, Array(srsv)) case _ => sparse(v).t } http://git-wip-us.apache.org/repos/asf/mahout/blob/f6224fcf/spark/src/main/scala/org/apache/mahout/sparkbindings/blas/ABt.scala ---------------------------------------------------------------------- diff --git a/spark/src/main/scala/org/apache/mahout/sparkbindings/blas/ABt.scala b/spark/src/main/scala/org/apache/mahout/sparkbindings/blas/ABt.scala index 5142d3b..d02c84f 100644 --- a/spark/src/main/scala/org/apache/mahout/sparkbindings/blas/ABt.scala +++ b/spark/src/main/scala/org/apache/mahout/sparkbindings/blas/ABt.scala @@ -25,12 +25,9 @@ import org.apache.mahout.sparkbindings._ import org.apache.mahout.math.drm.BlockifiedDrmTuple import org.apache.mahout.sparkbindings.drm._ import org.apache.mahout.math.{SparseMatrix, Matrix, SparseRowMatrix} -import org.apache.spark.SparkContext._ import org.apache.mahout.math.drm.logical.OpABt import org.apache.mahout.logging._ -import scala.tools.nsc.io.Pickler.TildeDecorator - /** Contains RDD plans for ABt operator */ object ABt {
