Simplify VitterXSampling

motinis · Jun 28, 2018 · 1d19c8f · 1d19c8f
1 parent 39da9b6
commit 1d19c8f
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/main/java/gr/james/sampling/VitterXSampling.java b/src/main/java/gr/james/sampling/VitterXSampling.java
@@ -41,19 +41,19 @@ public static <E> RandomSamplingCollector<E> collector(int sampleSize, Random ra
 
     @Override
     long skipLength(long streamSize, int sampleSize, Random random) {
-        long currentStream = streamSize + 1;
+        streamSize++;
 
         final double r = random.nextDouble();
-        long gamma = 0;
+        long skipCount = 0;
 
-        double quot = (currentStream - sampleSize) / (double) currentStream;
-        while (quot > r && currentStream > 0) {
-            gamma++;
-            currentStream++;
-            quot = (quot * (currentStream - sampleSize)) / (double) currentStream;
+        double quot = (streamSize - sampleSize) / (double) streamSize;
+        while (quot > r && streamSize > 0) {
+            skipCount++;
+            streamSize++;
+            quot = (quot * (streamSize - sampleSize)) / (double) streamSize;
         }
 
-        return gamma;
+        return skipCount;
     }
 
     /**