2 Commits

4 changed files with 11 additions and 9 deletions

5
.gitignore vendored
View File

@ -1,8 +1,12 @@
/.gitignore
/.cproject
/.project
# /src/
/src/ecoPCR
/src/ecofind
/src/*.P
/src/*.o
/src/ecogrep
# /src/libapat/
@ -14,3 +18,4 @@
# /src/libthermo/
/src/libthermo/*.P

View File

@ -1 +1 @@
0.8.0
1.0.0

Binary file not shown.

View File

@ -6,7 +6,7 @@
#include <getopt.h>
#define VERSION "1.0.0"
#define VERSION "1.0.1"
/* ----------------------------------------------- */
@ -610,13 +610,12 @@ int main(int argc, char **argv)
{
posj+=o2c->patlen;
// printf("coucou %d %d %d\n",posi,posj,apatseq->seqlen);
errj =apatseq->hiterr[1]->val[j];
errj = apatseq->hiterr[1]->val[j];
length = 0;
if (posj > posi)
length = posj - posi - o1->patlen - o2->patlen;
if (posj < posi)
//length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; // TODO
length = posi - posj - o1->patlen - o2->patlen;
length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
if ((length>0) && // For when primers touch or overlap
(!lmin || (length >= lmin)) &&
(!lmax || (length <= lmax)))
@ -668,11 +667,9 @@ int main(int argc, char **argv)
length = 0;
if (posj > posi)
//length = posj - posi + 1 - o2->patlen - o1->patlen; /* - o1->patlen : deleted by <EC> (prior to the OBITools3) */ TODO ????
length = posj - posi - o2->patlen - o1->patlen;
length = posj - posi + 1 - o2->patlen - o1->patlen; /* - o1->patlen : deleted by <EC> (prior to the OBITools3) */
if (posj < posi)
//length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen; TODO ????
length = posi - posj - o2->patlen - o1->patlen;
length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
if ((length>0) && // For when primers touch or overlap
(!lmin || (length >= lmin)) &&
(!lmax || (length <= lmax)))