Skip to content

Commit 3980287

Browse files
committed
rename variables
1 parent 62a2c3e commit 3980287

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

mllib/src/main/scala/org/apache/spark/mllib/rdd/VectorRDDFunctions.scala

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,27 +78,27 @@ class VectorRDDFunctions(self: RDD[Vector]) extends Serializable {
7878
maxVec,
7979
minVec)
8080
},
81-
combOp = (lhs, rhs) => (lhs, rhs) match {
81+
combOp = (c, v) => (c, v) match {
8282
case (
83-
(lhsMean, lhsM2n, lhsCnt, lhsNNZ, lhsMax, lhsMin),
84-
(rhsMean, rhsM2n, rhsCnt, rhsNNZ, rhsMax, rhsMin)) =>
85-
val totalCnt = lhsCnt + rhsCnt
86-
val deltaMean = rhsMean - lhsMean
87-
lhsMean :*= (lhsCnt / totalCnt)
88-
axpy(rhsCnt/totalCnt, rhsMean, lhsMean)
89-
val totalMean = lhsMean
83+
(mean1, m2n1, cnt1, nnz1, max1, min1),
84+
(mean2, m2n2, cnt2, nnz2, max2, min2)) =>
85+
val totalCnt = cnt1 + cnt2
86+
val deltaMean = mean2 - mean1
87+
mean1 :*= (cnt1 / totalCnt)
88+
axpy(cnt2/totalCnt, mean2, mean1)
89+
val totalMean = mean1
9090
deltaMean :*= deltaMean
91-
axpy(lhsCnt*rhsCnt/totalCnt, deltaMean, lhsM2n)
92-
axpy(1.0, rhsM2n, lhsM2n)
93-
val totalM2n = lhsM2n
94-
rhsMax.activeIterator.foreach { case (id, value) =>
95-
if (lhsMax(id) < value) lhsMax(id) = value
91+
axpy(cnt1*cnt2/totalCnt, deltaMean, m2n1)
92+
axpy(1.0, m2n2, m2n1)
93+
val totalM2n = m2n1
94+
max2.activeIterator.foreach { case (id, value) =>
95+
if (max1(id) < value) max1(id) = value
9696
}
97-
rhsMin.activeIterator.foreach { case (id, value) =>
98-
if (lhsMin(id) > value) lhsMin(id) = value
97+
min2.activeIterator.foreach { case (id, value) =>
98+
if (min1(id) > value) min1(id) = value
9999
}
100-
axpy(1.0, rhsNNZ, lhsNNZ)
101-
(totalMean, totalM2n, totalCnt, lhsNNZ, lhsMax, lhsMin)
100+
axpy(1.0, nnz2, nnz1)
101+
(totalMean, totalM2n, totalCnt, nnz1, max1, min1)
102102
}
103103
)
104104

0 commit comments

Comments
 (0)