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

r686: end seed trimming don't go over long join

This commit is contained in:
Heng Li 2018-02-06 11:31:32 -05:00
parent 29b4a1786c
commit a8d476c6ad
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
align.c
View File

@ -300,6 +300,7 @@ static void mm_fix_bad_ends(const mm_reg1_t *r, const mm128_t *a, int bw, int mi
for (i = r->as + 1; i < r->as + r->cnt - 1; ++i) { for (i = r->as + 1; i < r->as + r->cnt - 1; ++i) {
int32_t lq, lr, min, max; int32_t lq, lr, min, max;
int32_t q_span = a[i].y >> 32 & 0xff; int32_t q_span = a[i].y >> 32 & 0xff;
if (a[i].y & MM_SEED_LONG_JOIN) break;
lr = (int32_t)a[i].x - (int32_t)a[i-1].x; lr = (int32_t)a[i].x - (int32_t)a[i-1].x;
lq = (int32_t)a[i].y - (int32_t)a[i-1].y; lq = (int32_t)a[i].y - (int32_t)a[i-1].y;
min = lr < lq? lr : lq; min = lr < lq? lr : lq;
@ -314,6 +315,7 @@ static void mm_fix_bad_ends(const mm_reg1_t *r, const mm128_t *a, int bw, int mi
for (i = r->as + r->cnt - 2; i > *as; --i) { for (i = r->as + r->cnt - 2; i > *as; --i) {
int32_t lq, lr, min, max; int32_t lq, lr, min, max;
int32_t q_span = a[i+1].y >> 32 & 0xff; int32_t q_span = a[i+1].y >> 32 & 0xff;
if (a[i+1].y & MM_SEED_LONG_JOIN) break;
lr = (int32_t)a[i+1].x - (int32_t)a[i].x; lr = (int32_t)a[i+1].x - (int32_t)a[i].x;
lq = (int32_t)a[i+1].y - (int32_t)a[i].y; lq = (int32_t)a[i+1].y - (int32_t)a[i].y;
min = lr < lq? lr : lq; min = lr < lq? lr : lq;

2
main.c
View File

@ -6,7 +6,7 @@
#include "mmpriv.h" #include "mmpriv.h"
#include "getopt.h" #include "getopt.h"
#define MM_VERSION "2.8-r685-dirty" #define MM_VERSION "2.8-r686-dirty"
#ifdef __linux__ #ifdef __linux__
#include <sys/resource.h> #include <sys/resource.h>