diff --git a/src/ecoPrimer b/src/ecoPrimer deleted file mode 100755 index 336288c..0000000 Binary files a/src/ecoPrimer and /dev/null differ diff --git a/src/libecoprimer/filtering.c b/src/libecoprimer/filtering.c index 0f12492..a585f9e 100644 --- a/src/libecoprimer/filtering.c +++ b/src/libecoprimer/filtering.c @@ -117,7 +117,6 @@ static int32_t *ecoFilteringHashSequence(int32_t *dest, code = encoder[(*base) - 'A']; if (code <0) { - //DEBUG_LOG("Error on seq %s @ %d --> %c",seq->AC,j,*base); code = 0; error|= 1; } @@ -128,11 +127,12 @@ static int32_t *ecoFilteringHashSequence(int32_t *dest, if (!error) { - // DEBUG_LOG("No Error on %s @ %d",seq->AC,j); - goodword=(uint32_t)((doublestrand) ? MINI(word,antiword):word); + if (doublestrand) + goodword=(uint32_t)MINI(word,antiword); + else + goodword=word; if (!in_last_seq[goodword]) { - // DEBUG_LOG("Store word %s",ecoUnhashWord(goodword,FWORDSIZE)) in_last_seq[goodword]=1; dest[goodword]++; } @@ -172,17 +172,15 @@ int32_t *filteringSeq(pecodnadb_t database, uint32_t seqdbsize, for (i=0;i<*size;i++) if (wordscount[i] >= sequenceQuorum) keep++; - // else if (wordscount[i]) - // DEBUG_LOG("Word : %s -> %d",ecoUnhashWord(i,FWORDSIZE),wordscount[i]); (void)ecoFilteringHashSequence((int32_t*)-1, - options->circular, + options->circular, options->doublestrand, NULL, NULL); - fprintf(stderr,"ok\n Considered word of size %d for filtering with quorum >= %d : %d\n",FWORDSIZE,sequenceQuorum,keep); + fprintf(stderr,"ok\n Considered word of size %d for filtering : %d\n",FWORDSIZE,keep); return wordscount; }