Browse Source

Move code into bloom_filter module. Limit __all__ exposed from module.

Harshad Sharma 8 years ago
parent
commit
47a868c5b7
3 changed files with 21 additions and 8 deletions
  1. 12 0
      src/bloom_filter/__init__.py
  2. 3 2
      src/bloom_filter.py
  3. 6 6
      tests/test_bloom_filter.py

+ 12 - 0
src/bloom_filter/__init__.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# coding=utf-8
+
+from .bloom_filter import (
+    BloomFilter,
+    get_bitno_seed_rnd,
+)
+
+__all__ = [
+    'BloomFilter',
+    'get_bitno_seed_rnd',
+]

+ 3 - 2
src/bloom_filter.py

@@ -500,7 +500,7 @@ def try_unlink(filename):
     return
 
 
-class Bloom_filter(object):
+class BloomFilter(object):
     '''Probabilistic set membership testing for large sets'''
 
     #def __init__(self, ideal_num_elements_n, error_rate_p, probe_offsetter=get_index_bitmask_seed_rnd):
@@ -556,7 +556,7 @@ class Bloom_filter(object):
         self.probe_bitnoer = probe_bitnoer
 
     def __repr__(self):
-        return 'Bloom_filter(ideal_num_elements_n=%d, error_rate_p=%f, num_bits_m=%d)' % (
+        return 'BloomFilter(ideal_num_elements_n=%d, error_rate_p=%f, num_bits_m=%d)' % (
             self.ideal_num_elements_n,
             self.error_rate_p,
             self.num_bits_m,
@@ -603,3 +603,4 @@ class Bloom_filter(object):
         return True
 
         #return all(self.array_[i] & mask for i, mask in self.probe_bitnoer(self, key))
+

+ 6 - 6
tests/test_bloom_filter.py

@@ -45,7 +45,7 @@ def _test(description, values, trials, error_rate, probe_bitnoer=None, filename=
 
     divisor = 100000
 
-    bloom = bloom_filter.Bloom_filter(
+    bloom = bloom_filter.BloomFilter(
         ideal_num_elements_n=trials * 2,
         error_rate_p=error_rate,
         probe_bitnoer=probe_bitnoer,
@@ -206,11 +206,11 @@ def and_test():
 
     all_good = True
 
-    abc = bloom_filter.Bloom_filter(ideal_num_elements_n=100, error_rate_p=0.01)
+    abc = bloom_filter.BloomFilter(ideal_num_elements_n=100, error_rate_p=0.01)
     for character in ['a', 'b', 'c']:
         abc += character
 
-    bcd = bloom_filter.Bloom_filter(ideal_num_elements_n=100, error_rate_p=0.01)
+    bcd = bloom_filter.BloomFilter(ideal_num_elements_n=100, error_rate_p=0.01)
     for character in ['b', 'c', 'd']:
         bcd += character
 
@@ -238,11 +238,11 @@ def or_test():
 
     all_good = True
 
-    abc = bloom_filter.Bloom_filter(ideal_num_elements_n=100, error_rate_p=0.01)
+    abc = bloom_filter.BloomFilter(ideal_num_elements_n=100, error_rate_p=0.01)
     for character in ['a', 'b', 'c']:
         abc += character
 
-    bcd = bloom_filter.Bloom_filter(ideal_num_elements_n=100, error_rate_p=0.01)
+    bcd = bloom_filter.BloomFilter(ideal_num_elements_n=100, error_rate_p=0.01)
     for character in ['b', 'c', 'd']:
         bcd += character
 
@@ -282,7 +282,7 @@ def give_description(filename):
 
 
 def test_bloom_filter():
-    """Unit tests for Bloom_filter class"""
+    """Unit tests for BloomFilter class"""
 
     if sys.argv[1:] == ['--performance-test']:
         performance_test = True