Complete missing unweighted methods

motinis · Jun 27, 2018 · 08e7a7e · 08e7a7e
1 parent 4c25148
commit 08e7a7e
Show file tree

Hide file tree

Showing 4 changed files with 160 additions and 6 deletions.
diff --git a/src/main/java/gr/james/sampling/AbstractUnweightedRandomSampling.java b/src/main/java/gr/james/sampling/AbstractUnweightedRandomSampling.java
@@ -1,9 +1,6 @@
 package gr.james.sampling;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 
 /**
  * This class provides a skeletal implementation of the {@link RandomSampling} interface to minimize the effort required
@@ -53,7 +50,7 @@ abstract class AbstractUnweightedRandomSampling<T> implements RandomSampling<T>
      * @throws StreamOverflowException if the number of items feeded exceeds {@link Long#MAX_VALUE}
      */
     @Override
-    public final RandomSampling<T> feed(T item) {
+    public RandomSampling<T> feed(T item) {
         // Checks
         if (item == null) {
             throw new NullPointerException("Item was null");
@@ -86,6 +83,34 @@ public final RandomSampling<T> feed(T item) {
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @param items {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public RandomSampling<T> feed(Iterator<T> items) {
+        RandomSampling.super.feed(items);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param items {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public RandomSampling<T> feed(Iterable<T> items) {
+        RandomSampling.super.feed(items);
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      *
@@ -114,7 +139,7 @@ public final long streamSize() {
      * @return {@inheritDoc}
      */
     @Override
-    public Collection<T> sample() {
+    public final Collection<T> sample() {
         final List<T> r = new ArrayList<>(sample);
         assert r.size() == Math.min(sampleSize(), streamSize());
         return r;

diff --git a/src/main/java/gr/james/sampling/VitterXSampling.java b/src/main/java/gr/james/sampling/VitterXSampling.java
@@ -1,5 +1,6 @@
 package gr.james.sampling;
 
+import java.util.Iterator;
 import java.util.Random;
 
 /**
@@ -54,4 +55,46 @@ long skipLength(long streamSize, int sampleSize, Random random) {
 
         return gamma;
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param item {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public VitterXSampling<T> feed(T item) {
+        super.feed(item);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param items {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public VitterXSampling<T> feed(Iterator<T> items) {
+        super.feed(items);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param items {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public VitterXSampling<T> feed(Iterable<T> items) {
+        super.feed(items);
+        return this;
+    }
 }
diff --git a/src/main/java/gr/james/sampling/VitterZSampling.java b/src/main/java/gr/james/sampling/VitterZSampling.java
@@ -1,5 +1,6 @@
 package gr.james.sampling;
 
+import java.util.Iterator;
 import java.util.Random;
 
 /**
@@ -81,4 +82,46 @@ long skipLength(long streamSize, int sampleSize, Random random) {
             }
         }
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param item {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public VitterZSampling<T> feed(T item) {
+        super.feed(item);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param items {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public VitterZSampling<T> feed(Iterator<T> items) {
+        super.feed(items);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param items {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public VitterZSampling<T> feed(Iterable<T> items) {
+        super.feed(items);
+        return this;
+    }
 }
diff --git a/src/main/java/gr/james/sampling/WatermanSampling.java b/src/main/java/gr/james/sampling/WatermanSampling.java
@@ -1,5 +1,6 @@
 package gr.james.sampling;
 
+import java.util.Iterator;
 import java.util.Random;
 
 /**
@@ -48,4 +49,46 @@ long skipLength(long streamSize, int sampleSize, Random random) {
         }
         return skipCount;
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param item {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public WatermanSampling<T> feed(T item) {
+        super.feed(item);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param items {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public WatermanSampling<T> feed(Iterator<T> items) {
+        super.feed(items);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param items {@inheritDoc}
+     * @return {@inheritDoc}
+     * @throws NullPointerException    {@inheritDoc}
+     * @throws StreamOverflowException {@inheritDoc}
+     */
+    @Override
+    public WatermanSampling<T> feed(Iterable<T> items) {
+        super.feed(items);
+        return this;
+    }
 }