From bf0e8199e2d61cc9361da332300f41bb448eb264 Mon Sep 17 00:00:00 2001 From: Heng Li Date: Wed, 28 Jun 2017 10:39:27 -0400 Subject: [PATCH] r94: min_cnt is tested in a wrong way in chain --- chain.c | 10 +++++----- main.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chain.c b/chain.c index 038d1bc..de0e00d 100644 --- a/chain.c +++ b/chain.c @@ -88,11 +88,11 @@ int mm_chain_dp(int max_dist, int bw, int max_skip, int min_cnt, int min_sc, int t[j] = 1; j = p[j]; } while (j >= 0 && t[j] == 0); - if (j < 0 && n_v - n_v0 >= min_cnt) - u[k++] = u[i]>>32<<32 | (n_v - n_v0); - else if ((int32_t)(u[i]>>32) - f[j] >= min_sc && n_v - n_v0 >= min_cnt) - u[k++] = ((u[i]>>32) - f[j]) << 32 | (n_v - n_v0); - else n_v = n_v0; + if (j < 0) { + if (n_v - n_v0 >= min_cnt) u[k++] = u[i]>>32<<32 | (n_v - n_v0); + } else if ((int32_t)(u[i]>>32) - f[j] >= min_sc) { + if (n_v - n_v0 >= min_cnt) u[k++] = ((u[i]>>32) - f[j]) << 32 | (n_v - n_v0); + } else n_v = n_v0; } n_u = k, *_u = u; diff --git a/main.c b/main.c index aab9294..cbb9b24 100644 --- a/main.c +++ b/main.c @@ -10,7 +10,7 @@ #include "minimap.h" #include "mmpriv.h" -#define MM_VERSION "2.0-r93-pre" +#define MM_VERSION "2.0-r94-pre" void liftrlimit() {