Simplify AbstractRandomSampling.feed (#51)

Remove nested conditional indentations.
gstamatelat · Sep 3, 2022 · cd4c2c2 · cd4c2c2
1 parent ad40d7f
commit cd4c2c2
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/main/java/gr/james/sampling/AbstractRandomSampling.java b/src/main/java/gr/james/sampling/AbstractRandomSampling.java
@@ -94,24 +94,26 @@ public boolean feed(T item) {
         this.streamSize++;
         assert this.streamSize > 0;
 
-        // Skip items and add to reservoir
+        // Fill the reservoir
         if (sample.size() < sampleSize) {
             sample.add(item);
             assert sample.size() == Math.min(sampleSize(), streamSize());
             return true;
-        } else {
-            assert sample.size() == sampleSize;
-            if (skip > 0) {
-                skip--;
-                return false;
-            } else {
-                assert skip == 0;
-                sample.set(random.nextInt(sampleSize), item);
-                skip = skipLength(streamSize, sampleSize, random);
-                assert this.skip >= 0;
-                return true;
-            }
         }
+
+        // Skip items
+        assert sample.size() == sampleSize;
+        if (skip > 0) {
+            skip--;
+            return false;
+        }
+
+        // Accept and generate new skip
+        assert skip == 0;
+        sample.set(random.nextInt(sampleSize), item);
+        skip = skipLength(streamSize, sampleSize, random);
+        assert this.skip >= 0;
+        return true;
     }
 
     /**