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

r150: mm_sync_regs() doesn't work with negative id

This commit is contained in:
Heng Li 2017-07-03 11:36:34 -04:00
parent 53c4bf5e4f
commit b625247300
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hit.c
View File

@ -130,7 +130,7 @@ void mm_sync_regs(void *km, int n_regs, mm_reg1_t *regs) // keep mm_reg1_t::{id,
{ {
int *tmp, i, max_id = -1, n_tmp, n_pri; int *tmp, i, max_id = -1, n_tmp, n_pri;
if (n_regs <= 0) return; if (n_regs <= 0) return;
for (i = 0; i < n_regs; ++i) for (i = 0; i < n_regs; ++i) // NB: doesn't work if mm_reg1_t::id is negative
max_id = max_id > regs[i].id? max_id : regs[i].id; max_id = max_id > regs[i].id? max_id : regs[i].id;
n_tmp = max_id + 1; n_tmp = max_id + 1;
tmp = (int*)kmalloc(km, n_tmp * sizeof(int)); tmp = (int*)kmalloc(km, n_tmp * sizeof(int));
@ -187,7 +187,6 @@ void mm_filter_regs(void *km, const mm_mapopt_t *opt, int *n_regs, mm_reg1_t *re
} }
} }
*n_regs = k; *n_regs = k;
mm_sync_regs(km, k, regs);
} }
int mm_squeeze_a(void *km, int n_regs, mm_reg1_t *regs, mm128_t *a) int mm_squeeze_a(void *km, int n_regs, mm_reg1_t *regs, mm128_t *a)
@ -260,6 +259,7 @@ void mm_join_long(void *km, const mm_mapopt_t *opt, int qlen, int *n_regs_, mm_r
} }
} }
mm_filter_regs(km, opt, n_regs_, regs); mm_filter_regs(km, opt, n_regs_, regs);
mm_sync_regs(km, *n_regs_, regs);
} }
} }

2
main.c
View File

@ -10,7 +10,7 @@
#include "minimap.h" #include "minimap.h"
#include "mmpriv.h" #include "mmpriv.h"
#define MM_VERSION "2.0-r149-pre" #define MM_VERSION "2.0-r150-pre"
void liftrlimit() void liftrlimit()
{ {

2
map.c
View File

@ -250,7 +250,7 @@ mm_reg1_t *mm_map_frag(const mm_mapopt_t *opt, const mm_idx_t *mi, mm_tbuf_t *b,
mm_set_parent(b->km, opt->mask_level, *n_regs, regs); mm_set_parent(b->km, opt->mask_level, *n_regs, regs);
mm_select_sub(b->km, opt->mask_level, opt->pri_ratio, opt->best_n, n_regs, regs); mm_select_sub(b->km, opt->mask_level, opt->pri_ratio, opt->best_n, n_regs, regs);
} }
} else mm_filter_regs(b->km, opt, n_regs, regs); }
mm_set_mapq(*n_regs, regs); mm_set_mapq(*n_regs, regs);
// free // free