moved minSamplingRate to getUpperBound

apache · Jul 29, 2014 · 245439e · 245439e
1 parent eaf5771
commit 245439e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/src/main/scala/org/apache/spark/util/random/SamplingUtils.scala b/core/src/main/scala/org/apache/spark/util/random/SamplingUtils.scala
@@ -148,8 +148,7 @@ private[spark] object BinomialBounds {
    */
   def getLowerBound(delta: Double, n: Long, fraction: Double): Double = {
     val gamma = - math.log(delta) / n * (2.0 / 3.0)
-    math.max(minSamplingRate,
-      fraction + gamma - math.sqrt(gamma * gamma + 3 * gamma * fraction))
+    fraction + gamma - math.sqrt(gamma * gamma + 3 * gamma * fraction)
   }
 
   /**
@@ -158,6 +157,7 @@ private[spark] object BinomialBounds {
    */
   def getUpperBound(delta: Double, n: Long, fraction: Double): Double = {
     val gamma = - math.log(delta) / n
-    math.min(1, fraction + gamma + math.sqrt(gamma * gamma + 2 * gamma * fraction))
+    math.min(1,
+      math.max(minSamplingRate, fraction + gamma + math.sqrt(gamma * gamma + 2 * gamma * fraction)))
   }
 }