From f0b3750f19988add288eaf9d41304abc3cabbf38 Mon Sep 17 00:00:00 2001
From: Raphael Lemaitre <raphael@rlemaitre.com>
Date: Tue, 9 Aug 2016 11:29:37 +0200
Subject: [PATCH 1/2] Fix HTML in javadoc for java 8

---
 src/main/java/net/agkn/hll/HLL.java               | 15 ++++++++-------
 .../BigEndianAscendingWordSerializer.java         |  6 +++---
 .../agkn/hll/serialization/IWordDeserializer.java |  4 ++--
 .../agkn/hll/serialization/SerializationUtil.java |  6 +++---
 src/main/java/net/agkn/hll/util/BitVector.java    |  6 ++++--
 src/main/java/net/agkn/hll/util/HLLUtil.java      |  8 ++++----
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/main/java/net/agkn/hll/HLL.java b/src/main/java/net/agkn/hll/HLL.java
index cdfd3ad..6d8d9e7 100644
--- a/src/main/java/net/agkn/hll/HLL.java
+++ b/src/main/java/net/agkn/hll/HLL.java
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import java.io.Serializable;
 import java.util.Arrays;
 
 import it.unimi.dsi.fastutil.ints.Int2ByteOpenHashMap;
@@ -34,12 +35,12 @@
 
 /**
  * A probabilistic set of hashed <code>long</code> elements. Useful for computing
- * the approximate cardinality of a stream of data in very small storage.<p/>
+ * the approximate cardinality of a stream of data in very small storage.
  *
  * A modified version of the <a href="http://algo.inria.fr/flajolet/Publications/FlFuGaMe07.pdf">
  * 'HyperLogLog' data structure and algorithm</a> is used, which combines both
  * probabilistic and non-probabilistic techniques to improve the accuracy and
- * storage requirements of the original algorithm.<p/>
+ * storage requirements of the original algorithm.
  *
  * More specifically, initializing and storing a new {@link HLL} will
  * allocate a sentinel value symbolizing the empty set ({@link HLLType#EMPTY}).
@@ -48,7 +49,7 @@
  * be sacrificed for memory footprint: the values in the sorted list are
  * "promoted" to a "{@link HLLType#SPARSE}" map-based HyperLogLog structure.
  * Finally, when enough registers are set, the map-based HLL will be converted
- * to a bit-packed "{@link HLLType#FULL}" HyperLogLog structure.<p/>
+ * to a bit-packed "{@link HLLType#FULL}" HyperLogLog structure.
  *
  * This data structure is interoperable with the implementations found at:
  * <ul>
@@ -156,7 +157,7 @@ public class HLL implements Cloneable {
      * @param expthresh tunes when the {@link HLLType#EXPLICIT} to
      *        {@link HLLType#SPARSE} promotion occurs,
      *        based on the set's cardinality. Must be at least -1 and at most 18.
-     *        <table>
+     *        <table summary="">
      *        <thead><tr><th><code>expthresh</code> value</th><th>Meaning</th></tr></thead>
      *        <tbody>
      *        <tr>
@@ -238,7 +239,7 @@ public HLL(final int log2m, final int regwidth, final int expthresh, final boole
     }
 
     /**
-     *  Construct an empty HLL with the given {@code log2m} and {@code regwidth}.<p/>
+     *  Construct an empty HLL with the given {@code log2m} and {@code regwidth}.
      *
      *  This is equivalent to calling <code>HLL(log2m, regwidth, -1, true, HLLType.EMPTY)</code>.
      *
@@ -596,7 +597,7 @@ public long cardinality() {
     // Clear
     /**
      * Clears the HLL. The HLL will have cardinality zero and will act as if no
-     * elements have been added.<p/>
+     * elements have been added.
      *
      * NOTE: Unlike {@link #addRaw(long)}, <code>clear</code> does NOT handle
      * transitions between {@link HLLType}s - a probabilistic type will remain
@@ -938,7 +939,7 @@ public byte[] toBytes(final ISchemaVersion schemaVersion) {
 
     /**
      * Deserializes the HLL (in {@link #toBytes(ISchemaVersion)} format) serialized
-     * into <code>bytes</code>.<p/>
+     * into <code>bytes</code>.
      *
      * @param  bytes the serialized bytes of new HLL
      * @return the deserialized HLL. This will never be <code>null</code>.
diff --git a/src/main/java/net/agkn/hll/serialization/BigEndianAscendingWordSerializer.java b/src/main/java/net/agkn/hll/serialization/BigEndianAscendingWordSerializer.java
index 3ad7ce1..5b713ec 100644
--- a/src/main/java/net/agkn/hll/serialization/BigEndianAscendingWordSerializer.java
+++ b/src/main/java/net/agkn/hll/serialization/BigEndianAscendingWordSerializer.java
@@ -22,13 +22,13 @@
  * a low bit in a byte. However, a high byte in a word is written at a lower index
  * in the array than a low byte in a word. The first word is written at the lowest
  * array index. Each serializer is one time use and returns its backing byte
- * array.<p/>
+ * array.
  *
  * This encoding was chosen so that when reading bytes as octets in the typical
  * first-octet-is-the-high-nibble fashion, an octet-to-binary conversion
- * would yield a high-to-low, left-to-right view of the "short words".<p/>
+ * would yield a high-to-low, left-to-right view of the "short words".
  *
- * Example:<p/>
+ * Example:
  *
  * Say short words are 5 bits wide. Our word sequence is the values
  * <code>[31, 1, 5]</code>. In big-endian binary format, the values are
diff --git a/src/main/java/net/agkn/hll/serialization/IWordDeserializer.java b/src/main/java/net/agkn/hll/serialization/IWordDeserializer.java
index e11fd7b..e8ab12b 100644
--- a/src/main/java/net/agkn/hll/serialization/IWordDeserializer.java
+++ b/src/main/java/net/agkn/hll/serialization/IWordDeserializer.java
@@ -29,7 +29,7 @@ public interface IWordDeserializer {
     long readWord();
 
     /**
-     * Returns the number of words that could be encoded in the sequence.<p/>
+     * Returns the number of words that could be encoded in the sequence.
      *
      * NOTE:  the sequence that was encoded may be shorter than the value this
      *        method returns due to padding issues within bytes. This guarantees
@@ -39,4 +39,4 @@ public interface IWordDeserializer {
      * @return the maximum number of words that could be read from the sequence.
      */
     int totalWordCount();
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/agkn/hll/serialization/SerializationUtil.java b/src/main/java/net/agkn/hll/serialization/SerializationUtil.java
index d03c4cf..f0b7e23 100644
--- a/src/main/java/net/agkn/hll/serialization/SerializationUtil.java
+++ b/src/main/java/net/agkn/hll/serialization/SerializationUtil.java
@@ -91,7 +91,7 @@ public class SerializationUtil {
      * List of registered schema versions, indexed by their version numbers. If
      * an entry is <code>null</code>, then no such schema version is registered.
      * Similarly, registering a new schema version simply entails assigning an
-     * {@link ISchemaVersion} instance to the appropriate index of this array.<p/>
+     * {@link ISchemaVersion} instance to the appropriate index of this array.
      *
      * By default, only {@link SchemaVersionOne} is registered. Note that version
      * zero will always be reserved for internal (e.g. proprietary, legacy) schema
@@ -172,7 +172,7 @@ public static byte packVersionByte(final int schemaVersion, final int typeOrdina
      *             If 'auto' is chosen, this value should be <code>63</code>.
      *           </li>
      *           <li>
-     *             If a cutoff of 2<sup>n</sup> is desired, for <code>0 <= n < 31</code>,
+     *             If a cutoff of 2<sup>n</sup> is desired, for <code>0 &lt;= n &lt; 31</code>,
      *             this value should be <code>n + 1</code>.
      *           </li>
      *         </ul>
@@ -190,7 +190,7 @@ public static byte packCutoffByte(final int explicitCutoff, final boolean sparse
     /**
      * Generates a byte that encodes the parameters of a
      * {@link HLLType#FULL} or {@link HLLType#SPARSE}
-     * HLL.<p/>
+     * HLL.
      *
      * The top 3 bits are used to encode <code>registerWidth - 1</code>
      * (range of <code>registerWidth</code> is thus 1-9) and the bottom 5
diff --git a/src/main/java/net/agkn/hll/util/BitVector.java b/src/main/java/net/agkn/hll/util/BitVector.java
index 56687b1..4785caa 100644
--- a/src/main/java/net/agkn/hll/util/BitVector.java
+++ b/src/main/java/net/agkn/hll/util/BitVector.java
@@ -18,6 +18,8 @@
 
 import net.agkn.hll.serialization.IWordSerializer;
 
+import java.io.Serializable;
+
 /**
  * A vector (array) of bits that is accessed in units ("registers") of <code>width</code>
  * bits which are stored as 64bit "words" (<code>long</code>s).  In this context
@@ -172,7 +174,7 @@ public LongIterator registerIterator() {
     /**
      * Sets the value of the specified index register if and only if the specified
      * value is greater than the current value in the register.  This is equivalent
-     * to but much more performant than:<p/>
+     * to but much more performant than:
      *
      * <pre>vector.setRegister(index, Math.max(vector.getRegister(index), value));</pre>
      *
@@ -259,4 +261,4 @@ public BitVector clone() {
         System.arraycopy(words, 0, copy.words, 0, words.length);
         return copy;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/net/agkn/hll/util/HLLUtil.java b/src/main/java/net/agkn/hll/util/HLLUtil.java
index d3f97f2..cba9425 100644
--- a/src/main/java/net/agkn/hll/util/HLLUtil.java
+++ b/src/main/java/net/agkn/hll/util/HLLUtil.java
@@ -148,7 +148,7 @@ public static long pwMaxMask(final int registerSizeInBits) {
      * The cutoff for using the "small range correction" formula, in the
      * HyperLogLog algorithm.
      *
-     * @param  m the number of registers in the HLL. <em>m<em> in the paper.
+     * @param  m the number of registers in the HLL. <em>m</em> in the paper.
      * @return the cutoff for the small range correction.
      * @see #smallEstimator(int, int)
      */
@@ -161,7 +161,7 @@ public static double smallEstimatorCutoff(final int m) {
      * appropriate if both the estimator is smaller than <pre>(5/2) * m</pre> and
      * there are still registers that have the zero value.
      *
-     * @param  m the number of registers in the HLL. <em>m<em> in the paper.
+     * @param  m the number of registers in the HLL. <em>m</em> in the paper.
      * @param  numberOfZeroes the number of registers with value zero. <em>V</em>
      *         in the paper.
      * @return a corrected cardinality estimate.
@@ -174,7 +174,7 @@ public static double smallEstimator(final int m, final int numberOfZeroes) {
      * The cutoff for using the "large range correction" formula, from the
      * HyperLogLog algorithm, adapted for 64 bit hashes.
      *
-     * @param  log2m log-base-2 of the number of registers in the HLL. <em>b<em> in the paper.
+     * @param  log2m log-base-2 of the number of registers in the HLL. <em>b</em> in the paper.
      * @param  registerSizeInBits the size of the HLL registers, in bits.
      * @return the cutoff for the large range correction.
      * @see #largeEstimator(int, int, double)
@@ -189,7 +189,7 @@ public static double largeEstimatorCutoff(final int log2m, final int registerSiz
      * for 64 bit hashes. Only appropriate for estimators whose value exceeds
      * the return of {@link #largeEstimatorCutoff(int, int)}.
      *
-     * @param  log2m log-base-2 of the number of registers in the HLL. <em>b<em> in the paper.
+     * @param  log2m log-base-2 of the number of registers in the HLL. <em>b</em> in the paper.
      * @param  registerSizeInBits the size of the HLL registers, in bits.
      * @param  estimator the original estimator ("E" in the paper).
      * @return a corrected cardinality estimate.

From fb44b24bbd3a07af714c7e0ac91a4894f6f5f78d Mon Sep 17 00:00:00 2001
From: Raphael Lemaitre <raphael@rlemaitre.com>
Date: Tue, 9 Aug 2016 11:30:23 +0200
Subject: [PATCH 2/2] Make HLL and BitVector serializable

---
 src/main/java/net/agkn/hll/HLL.java            | 2 +-
 src/main/java/net/agkn/hll/util/BitVector.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/agkn/hll/HLL.java b/src/main/java/net/agkn/hll/HLL.java
index 6d8d9e7..7741a37 100644
--- a/src/main/java/net/agkn/hll/HLL.java
+++ b/src/main/java/net/agkn/hll/HLL.java
@@ -60,7 +60,7 @@
  *
  * @author timon
  */
-public class HLL implements Cloneable {
+public class HLL implements Cloneable, Serializable {
     // minimum and maximum values for the log-base-2 of the number of registers
     // in the HLL
     public static final int MINIMUM_LOG2M_PARAM = 4;
diff --git a/src/main/java/net/agkn/hll/util/BitVector.java b/src/main/java/net/agkn/hll/util/BitVector.java
index 4785caa..11caf31 100644
--- a/src/main/java/net/agkn/hll/util/BitVector.java
+++ b/src/main/java/net/agkn/hll/util/BitVector.java
@@ -27,7 +27,7 @@
  *
  * @author rgrzywinski
  */
-public class BitVector implements Cloneable {
+public class BitVector implements Cloneable, Serializable {
     // NOTE:  in this context, a word is 64bits
 
     // rather than doing division to determine how a bit index fits into 64bit