adding fuse16

Author: lemire

fastfilter/src/test/java/org/fastfilter/TestFilterType.java

@@ -14,6 +14,7 @@
 import org.fastfilter.xor.Xor16;
 import org.fastfilter.xor.Xor8;
 import org.fastfilter.xor.XorBinaryFuse8;
+import org.fastfilter.xor.XorBinaryFuse16;
 import org.fastfilter.xor.XorSimple;
 import org.fastfilter.xor.XorSimple2;
 import org.fastfilter.xorplus.XorPlus8;
@@ -100,6 +101,12 @@ public Filter construct(long[] keys, int setting) {
             return XorBinaryFuse8.construct(keys);
         }
     },
+    XOR_BINARY_FUSE_16 {
+        @Override
+        public Filter construct(long[] keys, int setting) {
+            return XorBinaryFuse16.construct(keys);
+        }
+    },
     CUCKOO_8 {
         @Override
         public Filter construct(long[] keys, int setting) {

fastfilter/src/test/java/org/fastfilter/xor/ProbabilityCFuse.java

@@ -24,7 +24,6 @@ public class ProbabilityCFuse {
 
     public static void main(String... args) {
         for(int size = 1; size < 1_000_000; size *= 10) {
-        // for(int size = 1; size < 1_000_000; size = (size < 100) ? (size + 1) : (int) (size * 1.1)) {
             Data best = null;
             for (int segmentLengthBits = 3; segmentLengthBits < 14; segmentLengthBits++) {
                 int segmentLength = 1 << segmentLengthBits;
@@ -65,7 +64,6 @@ static Data getProbability(int size, int segmentLengthBits, double load, Data be
         if (best != null && d.bitsPerKey > best.bitsPerKey) {
             return null;
         }
-        // System.out.println("  test " + d);
         int successCount = 0;
         int testCount = Math.max(10, 10_000_000 / size);
         for(int seed = 0; seed < testCount; seed++) {

fastfilter/src/test/java/org/fastfilter/xor/ProbabilityCFuse2.java

@@ -37,12 +37,6 @@ private static void testProb() {
                 long seed = 0;
                 long key = i;
                 long hash = Hash.hash64(key, seed);
-
-//                int r0 = (int) Hash.hash64(hash, 1);
-//                int x = Hash.reduce(r0, segmentCount);
-//                int h0 = x + (int) (Hash.hash64(hash, 2) & (segmentLength - 1));
-//                int h1 = x + (int) (Hash.hash64(hash, 3) & (segmentLength - 1));
-//                int h2 = x + (int) (Hash.hash64(hash, 4) & (segmentLength - 1));
 //
                 int r0 = (int) Hash.hash64(hash, 1);
                 int x = Hash.reduce(r0, segmentCount * 2 + segmentLength - 1);
@@ -63,16 +57,9 @@ private static void testProb() {
     }
 
     public static void main(String... args) {
-//testProb();
-//if(true)return;
-
-
-//        for(int size = 100_000; size < 1_000_000; size *= 10) {
         for(int size = 1; size < 1_000_000; size *= 10) {
-        // for(int size = 1; size < 1_000_000; size = (size < 100) ? (size + 1) : (int) (size * 1.1)) {
             Data best = null;
             for (int segmentLengthBits = 3; segmentLengthBits <= 12; segmentLengthBits++) {
-//            for (int segmentLengthBits = 3; segmentLengthBits < 14; segmentLengthBits++) {
                 int segmentLength = 1 << segmentLengthBits;
                 if (segmentLength > size) {
                     break;
@@ -89,9 +76,6 @@ public static void main(String... args) {
             }
             if (best != null) {
                 System.out.println(best);
-//                for(int i=0; i<100; i++) {
-//                    System.out.println(i + ": " + best.data[i]);
-//                }
             }
         }
     }

fastfilter/src/test/java/org/fastfilter/xor/SmallSetTest.java

@@ -13,6 +13,7 @@ public void small() {
         Xor8.construct(new long[]{0xef9bddc5166c081cL, 0x33bf87adaa46dcfcL});
         Xor16.construct(new long[]{0xef9bddc5166c081cL, 0x33bf87adaa46dcfcL});
         XorBinaryFuse8.construct(new long[]{0xef9bddc5166c081cL, 0x33bf87adaa46dcfcL});
+        XorBinaryFuse16.construct(new long[]{0xef9bddc5166c081cL, 0x33bf87adaa46dcfcL});
         XorSimple.construct(new long[]{0xef9bddc5166c081cL, 0x33bf87adaa46dcfcL});
         XorSimple2.construct(new long[]{0xef9bddc5166c081cL, 0x33bf87adaa46dcfcL});
     }
@@ -41,6 +42,19 @@ public void smallSizes() {
         }
     }
 
+    @Test
+    public void smallSizes16() {
+        long lastTime = System.currentTimeMillis();
+        for (int n = 1; n < 1_500_000; n = (int) ((n * 1.01) + 7)) {
+            XorBinaryFuse16 f = testWithSize16(n);
+            long now = System.currentTimeMillis();
+            if (now - lastTime > 5000) {
+                lastTime = now;
+                System.out.println("n=" + n + " " + f.toString());
+            }
+        }
+    }
+    
     private static XorBinaryFuse8 testWithSize(int n) {
         long[] keys = new long[n];
         for (int i = 0; i < n; i++) {
@@ -49,4 +63,12 @@ private static XorBinaryFuse8 testWithSize(int n) {
         return XorBinaryFuse8.construct(keys);
     }
 
+    private static XorBinaryFuse16 testWithSize16(int n) {
+        long[] keys = new long[n];
+        for (int i = 0; i < n; i++) {
+            keys[i] = i;
+        }
+        return XorBinaryFuse16.construct(keys);
+    }
+
 }