[SPARK-3578] Fix upper bound in GraphGenerators.sampleLogNormal

GraphGenerators.sampleLogNormal is supposed to return an integer strictly less than maxVal. However, it violates this guarantee. It generates its return value as follows:

```scala
var X: Double = maxVal

while (X >= maxVal) {
  val Z = rand.nextGaussian()
  X = math.exp(mu + sigma*Z)
}
math.round(X.toFloat)
```

When X is sampled to be close to (but less than) maxVal, then it will pass the while loop condition, but the rounded result will be equal to maxVal, which will violate the guarantee. For example, if maxVal is 5 and X is 4.9, then X < maxVal, but `math.round(X.toFloat)` is 5.

This PR instead rounds X before checking the loop condition, guaranteeing that the condition will hold for the return value.

Author: Ankur Dave <ankurdave@gmail.com>

Closes #2439 from ankurdave/SPARK-3578 and squashes the following commits:

f6655e5 [Ankur Dave] Go back to math.floor
5900c22 [Ankur Dave] Round X in loop condition
6fd5fb1 [Ankur Dave] Run sampleLogNormal bounds check 1000 times
1638598 [Ankur Dave] Round down in sampleLogNormal to guarantee upper bound
This commit is contained in:
Ankur Dave 2014-09-22 13:47:43 -07:00 коммит произвёл Joseph E. Gonzalez
Родитель 56dae30ca7
Коммит f9d6220c79
2 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -118,7 +118,7 @@ object GraphGenerators {
val Z = rand.nextGaussian()
X = math.exp(mu + sigma*Z)
}
math.round(X.toFloat)
math.floor(X).toInt
}
/**

Просмотреть файл

@ -64,8 +64,11 @@ class GraphGeneratorsSuite extends FunSuite with LocalSparkContext {
val sigma = 1.3
val maxVal = 100
val dstId = GraphGenerators.sampleLogNormal(mu, sigma, maxVal)
assert(dstId < maxVal)
val trials = 1000
for (i <- 1 to trials) {
val dstId = GraphGenerators.sampleLogNormal(mu, sigma, maxVal)
assert(dstId < maxVal)
}
val dstId_round1 = GraphGenerators.sampleLogNormal(mu, sigma, maxVal, 12345)
val dstId_round2 = GraphGenerators.sampleLogNormal(mu, sigma, maxVal, 12345)