zzh
/
bwa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix: wrong B-tree comparison

This commit is contained in:
Heng Li 2013-01-31 16:39:24 -05:00
parent 8977737460
commit 5d372cef65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bwamem.c
View File

@ -57,8 +57,8 @@ int smem_next(smem_i *itr)
#include "kbtree.h" #include "kbtree.h"
#define chain_lt(a, b) ((a).pos < (b).pos) #define chain_cmp(a, b) ((a).pos - (b).pos)
KBTREE_INIT(chn, memchain1_t, chain_lt) KBTREE_INIT(chn, memchain1_t, chain_cmp)
static int test_and_merge(const memopt_t *opt, memchain1_t *c, const memseed_t *p) static int test_and_merge(const memopt_t *opt, memchain1_t *c, const memseed_t *p)
{ {
@ -66,7 +66,7 @@ static int test_and_merge(const memopt_t *opt, memchain1_t *c, const memseed_t *
const memseed_t *last = &c->seeds[c->n-1]; const memseed_t *last = &c->seeds[c->n-1];
qend = last->qbeg + last->len; qend = last->qbeg + last->len;
rend = last->rbeg + last->len; rend = last->rbeg + last->len;
if (p->qbeg > c->seeds[0].qbeg && p->qbeg + p->len < qend && p->rbeg > c->seeds[0].rbeg && p->rbeg + p->len < rend) if (p->qbeg >= c->seeds[0].qbeg && p->qbeg + p->len <= qend && p->rbeg >= c->seeds[0].rbeg && p->rbeg + p->len <= rend)
return 1; // contained seed; do nothing return 1; // contained seed; do nothing
x = p->qbeg - last->qbeg; // always positive x = p->qbeg - last->qbeg; // always positive
y = p->rbeg - last->rbeg; y = p->rbeg - last->rbeg;