Commit 9deb30a8 authored by Eric Coissac's avatar Eric Coissac

Patch a bug inducing that sequences were considered as circular whatever

the -c option was present or not.
parent c4321036
......@@ -614,8 +614,10 @@ int main(int argc, char **argv)
length = 0;
if (posj > posi)
length = posj - posi - o1->patlen - o2->patlen;
if (posj < posi)
length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
else {
if (circular > 0)
length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
}
if ((length>0) && // For when primers touch or overlap
(!lmin || (length >= lmin)) &&
(!lmax || (length <= lmax)))
......@@ -648,7 +650,7 @@ int main(int argc, char **argv)
}
o1cHits = ManberAll(apatseq,o1c,3,begin,length);
printf("circular= %d\n",circular);
if (o1cHits)
for (i=0; i < o2Hits;i++)
{
......@@ -668,8 +670,11 @@ 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) */
if (posj < posi)
else {
if (circular > 0)
length = posj + apatseq->seqlen - posi - o1->patlen - o2->patlen;
}
if ((length>0) && // For when primers touch or overlap
(!lmin || (length >= lmin)) &&
(!lmax || (length <= lmax)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment