From 1d19c8f68d6b0dbeb5f395af4a7ca32c44097dc9 Mon Sep 17 00:00:00 2001 From: Giorgos Stamatelatos Date: Thu, 28 Jun 2018 14:29:06 +0300 Subject: [PATCH] Simplify VitterXSampling --- .../java/gr/james/sampling/VitterXSampling.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/gr/james/sampling/VitterXSampling.java b/src/main/java/gr/james/sampling/VitterXSampling.java index 34ba19b..4c97b0c 100644 --- a/src/main/java/gr/james/sampling/VitterXSampling.java +++ b/src/main/java/gr/james/sampling/VitterXSampling.java @@ -41,19 +41,19 @@ public static RandomSamplingCollector 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; } /**