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

r362: fixed overestimated chaining score 

Caused by ilog2_32(0)=-1. This bug was fixed once and reoccurred as I was
tuning the score function but forgot to apply the fix.
This commit is contained in:
Heng Li 2017-09-14 10:15:22 -04:00
parent 6a82a21dee
commit f4a8766283
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chain.c
View File

@ -45,20 +45,21 @@ int mm_chain_dp(int max_dist_x, int max_dist_y, int bw, int max_skip, int min_cn
while (st < i && ri - a[st].x > max_dist_x) ++st; while (st < i && ri - a[st].x > max_dist_x) ++st;
for (j = i - 1; j >= st; --j) { for (j = i - 1; j >= st; --j) {
int64_t dr = ri - a[j].x; int64_t dr = ri - a[j].x;
int32_t dq = qi - (int32_t)a[j].y, dd, sc; int32_t dq = qi - (int32_t)a[j].y, dd, sc, log_dd;
if (dr == 0 || dq <= 0 || dq > max_dist_y) continue; if (dr == 0 || dq <= 0 || dq > max_dist_y) continue;
dd = dr > dq? dr - dq : dq - dr; dd = dr > dq? dr - dq : dq - dr;
if (dd > bw) continue; if (dd > bw) continue;
max_f_past = max_f_past > f[j]? max_f_past : f[j]; max_f_past = max_f_past > f[j]? max_f_past : f[j];
min_d = dq < dr? dq : dr; min_d = dq < dr? dq : dr;
sc = min_d > q_span? q_span : dq < dr? dq : dr; sc = min_d > q_span? q_span : dq < dr? dq : dr;
log_dd = dd? ilog2_32(dd) : 0;
if (is_cdna) { if (is_cdna) {
int c_log, c_lin; int c_log, c_lin;
c_lin = (int)(dd * .01 * avg_qspan); c_lin = (int)(dd * .01 * avg_qspan);
c_log = ilog2_32(dd); c_log = log_dd;
if (dr > dq) sc -= c_lin < c_log? c_lin : c_log; if (dr > dq) sc -= c_lin < c_log? c_lin : c_log;
else sc -= c_lin + (c_log>>1); else sc -= c_lin + (c_log>>1);
} else sc -= (int)(dd * .01 * avg_qspan) + (ilog2_32(dd)>>1); } else sc -= (int)(dd * .01 * avg_qspan) + (log_dd>>1);
sc += f[j]; sc += f[j];
if (sc > max_f) { if (sc > max_f) {
max_f = sc, max_j = j; max_f = sc, max_j = j;

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.1.1-r361-dirty" #define MM_VERSION "2.1.1-r362-dirty"
#ifdef __linux__ #ifdef __linux__
#include <sys/resource.h> #include <sys/resource.h>