obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Documented changes made in bloom functions

Browse Source
This commit is contained in:
Celine Mercier
2016-04-21 11:22:31 +02:00
parent 7a88ca619a
commit 00f2f2cc51
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/bloom.c
View File

@ -122,7 +122,6 @@ static void setup_buckets(struct bloom * bloom, unsigned int cache_size)
} }
// TODO
int bloom_filter_size(int entries, double error) int bloom_filter_size(int entries, double error)
{ {
int bytes; int bytes;
@ -185,7 +184,8 @@ int bloom_init_size(struct bloom * bloom, int entries, double error,
setup_buckets(bloom, cache_size); setup_buckets(bloom, cache_size);
// TODO comment // celine.mercier@metabarcoding.org :
// Replaced the calloc with a memset, as the memory for the bloom filter is mapped in our data structure
memset(bloom->bf, 0, bloom->bytes); memset(bloom->bf, 0, bloom->bytes);
//bloom->bf = (unsigned char *)calloc(bloom->bytes, sizeof(unsigned char)); //bloom->bf = (unsigned char *)calloc(bloom->bytes, sizeof(unsigned char));
//if (bloom->bf == NULL) { //if (bloom->bf == NULL) {

15
src/bloom.h
View File

@ -9,7 +9,12 @@
#define _BLOOM_H #define _BLOOM_H
// TODO /** ***************************************************************************
* Added by celine.mercier@metabarcoding.org
*
* Bloom filter error rate wanted.
*
*/
#define BLOOM_FILTER_ERROR_RATE (0.001) #define BLOOM_FILTER_ERROR_RATE (0.001)
@ -72,7 +77,13 @@ struct bloom
typedef struct bloom bloom_t; typedef struct bloom bloom_t;
// TODO /** ***************************************************************************
* Added by celine.mercier@metabarcoding.org
*
* This function computes the size needed by the bloom filter
* depending on the number of entries and the error rate.
*
*/
int bloom_filter_size(int entries, double error); int bloom_filter_size(int entries, double error);