Skip to content

Commit c27a4c3

Browse files
committed
Resolv conflict
2 parents 888b216 + 59383fd commit c27a4c3

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

mllib/src/main/scala/org/apache/spark/mllib/util/LinearDataGenerator.scala

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,12 @@ object LinearDataGenerator {
135135
val x = Array.fill[Array[Double]](nPoints)(
136136
Array.fill[Double](weights.length)(rnd.nextDouble()))
137137

138+
val sparseRnd = new Random(seed)
138139
x.foreach { v =>
139140
var i = 0
140141
val len = v.length
141142
while (i < len) {
142-
if (rnd.nextDouble() <= sparsity) {
143+
if (sparseRnd.nextDouble() < sparsity) {
143144
v(i) = 0.0
144145
} else {
145146
v(i) = (v(i) - 0.5) * math.sqrt(12.0 * xVariance(i)) + xMean(i)
@@ -152,14 +153,6 @@ object LinearDataGenerator {
152153
blas.ddot(weights.length, xi, 1, weights, 1) + intercept + eps * rnd.nextGaussian()
153154
}
154155

155-
val sparseX = x.map { (v: Array[Double]) =>
156-
v.zipWithIndex.filter {
157-
case (d: Double, i: Int) => d != 0.0
158-
}.map {
159-
case (d: Double, i: Int) => (i, d)
160-
}
161-
}
162-
163156
y.zip(x).map { p =>
164157
if (sparsity == 0.0) {
165158
// Return LabeledPoints with DenseVector

0 commit comments

Comments
 (0)