obitools/ecopcr
2
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fixed length computation bug introduced in last version

Browse Source
This commit is contained in:
Celine Mercier
2019-01-22 15:17:59 +01:00
parent a92a7fa070
commit c4321036be
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ecopcr.c
View File

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