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

r1050: -r accepts two bandwidths

This commit is contained in:
Heng Li 2021-05-24 16:29:21 -04:00
parent 379728726a
commit 9626b3e716
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.c
View File

@ -7,7 +7,7 @@
#include "mmpriv.h" #include "mmpriv.h"
#include "ketopt.h" #include "ketopt.h"
#define MM_VERSION "2.18-r1049-dirty" #define MM_VERSION "2.18-r1050-dirty"
#ifdef __linux__ #ifdef __linux__
#include <sys/resource.h> #include <sys/resource.h>
@ -83,17 +83,23 @@ static ko_longopt_t long_options[] = {
{ 0, 0, 0 } { 0, 0, 0 }
}; };
static inline int64_t mm_parse_num(const char *str) static inline int64_t mm_parse_num2(const char *str, char **q)
{ {
double x; double x;
char *p; char *p;
x = strtod(str, &p); x = strtod(str, &p);
if (*p == 'G' || *p == 'g') x *= 1e9; if (*p == 'G' || *p == 'g') x *= 1e9, ++p;
else if (*p == 'M' || *p == 'm') x *= 1e6; else if (*p == 'M' || *p == 'm') x *= 1e6, ++p;
else if (*p == 'K' || *p == 'k') x *= 1e3; else if (*p == 'K' || *p == 'k') x *= 1e3, ++p;
if (q) *q = p;
return (int64_t)(x + .499); return (int64_t)(x + .499);
} }
static inline int64_t mm_parse_num(const char *str)
{
return mm_parse_num2(str, 0);
}
static inline void yes_or_no(mm_mapopt_t *opt, int flag, int long_idx, const char *arg, int yes_to_set) static inline void yes_or_no(mm_mapopt_t *opt, int flag, int long_idx, const char *arg, int yes_to_set)
{ {
if (yes_to_set) { if (yes_to_set) {
@ -145,7 +151,6 @@ int main(int argc, char *argv[])
else if (c == 'k') ipt.k = atoi(o.arg); else if (c == 'k') ipt.k = atoi(o.arg);
else if (c == 'H') ipt.flag |= MM_I_HPC; else if (c == 'H') ipt.flag |= MM_I_HPC;
else if (c == 'd') fnw = o.arg; // the above are indexing related options, except -I else if (c == 'd') fnw = o.arg; // the above are indexing related options, except -I
else if (c == 'r') opt.bw = (int)mm_parse_num(o.arg);
else if (c == 't') n_threads = atoi(o.arg); else if (c == 't') n_threads = atoi(o.arg);
else if (c == 'v') mm_verbose = atoi(o.arg); else if (c == 'v') mm_verbose = atoi(o.arg);
else if (c == 'g') opt.max_gap = (int)mm_parse_num(o.arg); else if (c == 'g') opt.max_gap = (int)mm_parse_num(o.arg);
@ -252,6 +257,9 @@ int main(int argc, char *argv[])
} else if (c == 'V') { } else if (c == 'V') {
puts(MM_VERSION); puts(MM_VERSION);
return 0; return 0;
} else if (c == 'r') {
opt.bw = (int)mm_parse_num2(o.arg, &s);
if (*s == ',') opt.bw_long = (int)mm_parse_num2(s + 1, &s);
} else if (c == 'U') { } else if (c == 'U') {
opt.min_mid_occ = strtol(o.arg, &s, 10); opt.min_mid_occ = strtol(o.arg, &s, 10);
if (*s == ',') opt.max_mid_occ = strtol(s + 1, &s, 10); if (*s == ',') opt.max_mid_occ = strtol(s + 1, &s, 10);