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

r478: simplied useless code, a tiny bit

This commit is contained in:
Heng Li 2017-10-05 15:56:00 -04:00
parent 9c5767f9ed
commit f266092699
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.2-r477-dirty" #define MM_VERSION "2.2-r478-dirty"
#ifdef __linux__ #ifdef __linux__
#include <sys/resource.h> #include <sys/resource.h>

7
map.c
View File

@ -109,10 +109,7 @@ typedef struct {
uint32_t n; uint32_t n;
uint32_t qpos; uint32_t qpos;
uint32_t seg_id; uint32_t seg_id;
union {
const uint64_t *cr; const uint64_t *cr;
uint64_t *r;
} x;
} mm_match_t; } mm_match_t;
struct mm_tbuf_s { struct mm_tbuf_s {
@ -187,7 +184,7 @@ static mm128_t *collect_seed_hits(const mm_mapopt_t *opt, int max_occ, const mm_
int t; int t;
mm128_t *p = &b->mini.a[i]; mm128_t *p = &b->mini.a[i];
m[i].qpos = (uint32_t)p->y; m[i].qpos = (uint32_t)p->y;
m[i].x.cr = mm_idx_get(mi, p->x>>8, &t); m[i].cr = mm_idx_get(mi, p->x>>8, &t);
m[i].n = t; m[i].n = t;
m[i].seg_id = p->y >> 32; m[i].seg_id = p->y >> 32;
} }
@ -197,7 +194,7 @@ static mm128_t *collect_seed_hits(const mm_mapopt_t *opt, int max_occ, const mm_
for (i = *rep_len = 0, *n_a = 0; i < b->mini.n; ++i) { for (i = *rep_len = 0, *n_a = 0; i < b->mini.n; ++i) {
mm128_t *p = &b->mini.a[i]; mm128_t *p = &b->mini.a[i];
mm_match_t *q = &m[i]; mm_match_t *q = &m[i];
const uint64_t *r = q->x.cr; const uint64_t *r = q->cr;
int k, q_span = p->x & 0xff, is_tandem = 0; int k, q_span = p->x & 0xff, is_tandem = 0;
if (q->n >= max_occ) { if (q->n >= max_occ) {
int en = (q->qpos>>1) + 1, st = en - q_span; int en = (q->qpos>>1) + 1, st = en - q_span;