Merge pull request #738 from IntersectMBO/wenkokke/fix-prop_calc_size_fpr_bits

fix(bloomfilter): fix tolerance for prop_calc_size_fpr_bits and prop_calc_size_fpr_fpr

Author: recursion-ninja

bloomfilter/tests/bloomfilter-tests.hs

@@ -164,23 +164,29 @@ prop_calc_size_fpr_fpr proxy (FPR fpr) (NumEntries numEntries) =
     -- Contrast with prop_calc_policy_fpr which does not do rounding to an
     -- integer number of bits (it uses Double for bits per key), and thus can
     -- use a very small tolerance.
-    tolerance | fpr <= 0.01 = 1e-6
-              | fpr <= 0.05 = 1e-5
-              | fpr <= 0.5  = 1e-4
+    tolerance | fpr <= 1e-4 = 1e-7
+              | fpr <= 1e-3 = 1e-6
+              | fpr <= 1e-2 = 1e-5
+              | fpr <= 1e-1 = 1e-4
               | otherwise   = 1e-3
 
 -- | Compare @sizeForBits@ against @falsePositiveRate@ with some tolerance for deviations
 prop_calc_size_fpr_bits :: BloomFilter bloom => Proxy bloom
                         -> BitsPerEntry -> NumEntries -> Property
-prop_calc_size_fpr_bits proxy (BitsPerEntry c) (NumEntries numEntries) =
-  let policy = policyForBits proxy c
+prop_calc_size_fpr_bits proxy (BitsPerEntry bpe) (NumEntries numEntries) =
+  let policy = policyForBits proxy bpe
       bsize  = sizeForPolicy proxy policy numEntries
    in falsePositiveRate (fromIntegral (B.sizeBits bsize))
                         (fromIntegral numEntries)
                         (fromIntegral (B.sizeHashes bsize))
    ~~~ policyFPR proxy policy
   where
-    (~~~) = withinTolerance 1e-6
+    (~~~) = withinTolerance tolerance
+    tolerance | bpe >= 18   = 1e-7
+              | bpe >= 13   = 1e-6
+              | bpe >= 8    = 1e-5
+              | bpe >= 4    = 1e-4
+              | otherwise   = 1e-3
 
 -- reference implementations used for sanity checks