xxay/hifiasm
1
0
Fork 0
mirror of https://github.com/chhylp123/hifiasm.git synced 2026-10-09 14:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

r187: reversed round in clear_opt()

Browse Source
This commit is contained in:
Heng Li
2020-04-03 22:19:55 -04:00
parent 76de054331
commit 18b69f1a72
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assembly.cpp
+2 -2
View File
@@ -1315,14 +1315,14 @@ int ha_assemble(void)
// error correction // error correction
assert(asm_opt.number_of_round > 0); assert(asm_opt.number_of_round > 0);
for (r = 0; r < asm_opt.number_of_round; ++r) { for (r = 0; r < asm_opt.number_of_round; ++r) {
clear_opt(&asm_opt, asm_opt.number_of_round - r); // this update asm_opt.roundID and a few other fields clear_opt(&asm_opt, r); // this update asm_opt.roundID and a few other fields
ha_overlap_and_correct(r); ha_overlap_and_correct(r);
fprintf(stderr, "[M::%s::%.3f*%.2f] ==> corrected reads for round %d\n", __func__, yak_realtime(), yak_cputime() / yak_realtime(), r + 1); fprintf(stderr, "[M::%s::%.3f*%.2f] ==> corrected reads for round %d\n", __func__, yak_realtime(), yak_cputime() / yak_realtime(), r + 1);
} }
Output_corrected_reads(); Output_corrected_reads();
fprintf(stderr, "[M::%s::%.3f*%.2f] ==> written corrected reads to disk\n", __func__, yak_realtime(), yak_cputime() / yak_realtime()); fprintf(stderr, "[M::%s::%.3f*%.2f] ==> written corrected reads to disk\n", __func__, yak_realtime(), yak_cputime() / yak_realtime());
// overlap between corrected reads // overlap between corrected reads
clear_opt(&asm_opt, 0); clear_opt(&asm_opt, asm_opt.number_of_round);
ha_overlap_final(); ha_overlap_final();
fprintf(stderr, "[M::%s::%.3f*%.2f] ==> found overlaps for the final round\n", __func__, yak_realtime(), yak_cputime() / yak_realtime()); fprintf(stderr, "[M::%s::%.3f*%.2f] ==> found overlaps for the final round\n", __func__, yak_realtime(), yak_cputime() / yak_realtime());
ha_ft_destroy(ha_flt_tab); ha_ft_destroy(ha_flt_tab);
CommandLines.cpp
+2 -2
View File
@@ -101,13 +101,13 @@ void destory_opt(hifiasm_opt_t* asm_opt)
} }
} }
void clear_opt(hifiasm_opt_t* asm_opt, int last_round) void clear_opt(hifiasm_opt_t* asm_opt, int round)
{ {
asm_opt->complete_threads = 0; asm_opt->complete_threads = 0;
asm_opt->num_bases = 0; asm_opt->num_bases = 0;
asm_opt->num_corrected_bases = 0; asm_opt->num_corrected_bases = 0;
asm_opt->num_recorrected_bases = 0; asm_opt->num_recorrected_bases = 0;
asm_opt->roundID = asm_opt->number_of_round - last_round; asm_opt->roundID = round;
} }
int check_file(char* name, const char* opt) int check_file(char* name, const char* opt)
CommandLines.h
+2 -2
View File
@@ -3,7 +3,7 @@
#include <pthread.h> #include <pthread.h>
#define HA_VERSION "0.3.0-dirty-r186" #define HA_VERSION "0.3.0-dirty-r187"
#define VERBOSE 0 #define VERBOSE 0
#define VERBOSE_GFA 0 #define VERBOSE_GFA 0
@@ -56,7 +56,7 @@ extern hifiasm_opt_t asm_opt;
void init_opt(hifiasm_opt_t* asm_opt); void init_opt(hifiasm_opt_t* asm_opt);
void destory_opt(hifiasm_opt_t* asm_opt); void destory_opt(hifiasm_opt_t* asm_opt);
void clear_opt(hifiasm_opt_t* asm_opt, int last_round); void clear_opt(hifiasm_opt_t* asm_opt, int round);
int CommandLine_process(int argc, char *argv[], hifiasm_opt_t* asm_opt); int CommandLine_process(int argc, char *argv[], hifiasm_opt_t* asm_opt);
double Get_T(void); double Get_T(void);