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

a little refactoring for PE support

This commit is contained in:
Heng Li 2013-02-10 12:24:33 -05:00
parent cb55617f50
commit c310fb7424
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bwamem.c
View File

@ -322,21 +322,31 @@ int mem_chain_flt(const mem_opt_t *opt, int n_chn, mem_chain_t *chains)
return n; return n;
} }
#define alnreg_lt(a, b) ((a).score > (b).score || ((a).score == (b).score && ((a).rb < (b).rb || ((a).rb == (b).rb && (a).qb < (b).qb)))) /******************************
KSORT_INIT(mem_ar, mem_alnreg_t, alnreg_lt) * De-overlap single-end hits *
******************************/
int mem_choose_alnreg_se(const mem_opt_t *opt, int n, mem_alnreg_t *a) #define alnreg_slt(a, b) ((a).score > (b).score || ((a).score == (b).score && ((a).rb < (b).rb || ((a).rb == (b).rb && (a).qb < (b).qb))))
{ // similar to the loop in mem_chain_flt() KSORT_INIT(mem_ars, mem_alnreg_t, alnreg_slt)
int i, j, m, tmp;
int mem_sort_and_dedup(int n, mem_alnreg_t *a)
{
int m, i;
if (n <= 1) return n; if (n <= 1) return n;
ks_introsort(mem_ar, n, a); ks_introsort(mem_ars, n, a);
for (i = 1; i < n; ++i) { // mark identical hits for (i = 1; i < n; ++i) { // mark identical hits
if (a[i].score == a[i-1].score && a[i].rb == a[i-1].rb && a[i].qb == a[i-1].qb) if (a[i].score == a[i-1].score && a[i].rb == a[i-1].rb && a[i].qb == a[i-1].qb)
a[i].qe = a[i].qb; a[i].qe = a[i].qb;
} }
for (i = 1, m = 1; i < n; ++i) // exclude identical hits for (i = 1, m = 1; i < n; ++i) // exclude identical hits
if (a[i].qe > a[i].qb) a[m++] = a[i]; if (a[i].qe > a[i].qb) a[m++] = a[i];
n = m; return m;
}
int mem_choose_alnreg_se(const mem_opt_t *opt, int n, mem_alnreg_t *a) // IMPORTANT: must run mem_sort_and_dedup() before calling this function
{ // similar to the loop in mem_chain_flt()
int i, j, m, tmp;
if (n <= 1) return n;
for (i = 0; i < n; ++i) a[i].sub = 0; for (i = 0; i < n; ++i) a[i].sub = 0;
tmp = opt->a + opt->b > opt->q + opt->r? opt->a + opt->b : opt->q + opt->r; tmp = opt->a + opt->b > opt->q + opt->r? opt->a + opt->b : opt->q + opt->r;
for (i = 1, m = 1; i < n; ++i) { for (i = 1, m = 1; i < n; ++i) {
@ -357,6 +367,10 @@ int mem_choose_alnreg_se(const mem_opt_t *opt, int n, mem_alnreg_t *a)
return m; return m;
} }
/************************
* Pick paired-end hits *
************************/
/**************************************** /****************************************
* Construct the alignment from a chain * * Construct the alignment from a chain *
****************************************/ ****************************************/
@ -493,14 +507,15 @@ static inline int approx_mapq_se(const mem_opt_t *opt, const mem_alnreg_t *a)
void mem_sam_se(const mem_opt_t *opt, const bntseq_t *bns, const uint8_t *pac, bseq1_t *s, mem_alnreg_v *a) void mem_sam_se(const mem_opt_t *opt, const bntseq_t *bns, const uint8_t *pac, bseq1_t *s, mem_alnreg_v *a)
{ {
int i, k, m; int i, k;
kstring_t str; kstring_t str;
char *seq; char *seq;
str.l = str.m = 0; str.s = 0; str.l = str.m = 0; str.s = 0;
m = mem_choose_alnreg_se(opt, a->n, a->a); a->n = mem_sort_and_dedup(a->n, a->a);
a->n = mem_choose_alnreg_se(opt, a->n, a->a);
seq = malloc(s->l_seq); seq = malloc(s->l_seq);
if (m == 0) { // no seeds found if (a->n == 0) { // no seeds found
for (i = 0; i < s->l_seq; ++i) seq[i] = "ACGTN"[(int)s->seq[i]]; for (i = 0; i < s->l_seq; ++i) seq[i] = "ACGTN"[(int)s->seq[i]];
kputs(s->name, &str); kputs("\t8\t*\t0\t0\t*\t*\t0\t0\t", &str); kputs(s->name, &str); kputs("\t8\t*\t0\t0\t*\t*\t0\t0\t", &str);
kputsn(seq, s->l_seq, &str); kputsn(seq, s->l_seq, &str);
@ -509,7 +524,7 @@ void mem_sam_se(const mem_opt_t *opt, const bntseq_t *bns, const uint8_t *pac, b
kputc('\n', &str); kputc('\n', &str);
goto ret_sam_se; goto ret_sam_se;
} }
for (k = 0; k < m; ++k) { for (k = 0; k < a->n; ++k) {
uint32_t *cigar = 0; uint32_t *cigar = 0;
int score, is_rev, nn, rid, flag = 0, n_cigar = 0, mapq = 0; int score, is_rev, nn, rid, flag = 0, n_cigar = 0, mapq = 0;
int64_t pos; int64_t pos;