Fixed output of BtLog.progress()

Author: Dom Laetsch

lib/BtIO.py

@@ -118,7 +118,7 @@ def readBam(infile, set_of_blobs):
                     base_cov_dict[seq_name] = base_cov_dict.get(seq_name, 0) + base_cov 
                     read_cov_dict[seq_name] = read_cov_dict.get(seq_name, 0) + 1 
         BtLog.progress(parsed_reads, progress_unit, reads_total)
-    #BtLog.progress(reads_total, progress_unit, reads_total)
+    BtLog.progress(reads_total, progress_unit, reads_total)
     if not int(reads_mapped) == int(parsed_reads):
         print warn_d['3'] % (reads_mapped, parsed_reads)
     return base_cov_dict, reads_total, parsed_reads, read_cov_dict

lib/BtLog.py

@@ -20,13 +20,14 @@ def error(message, *argv):
     exit(1)
 
 def progress(iteration, steps, max_value):
-    if int(iteration) % int(steps) == 0:
+    if int(iteration == max_value):
         sys.stdout.write('\r')
-        print "[PROGRESS]\t: %d%%" % (float(int(iteration)/int(max_value)*100)),
-        sys.stdout.flush()
-#    if int(iteration == max_value):
-#        sys.stdout.write('\r')
-#        print "[PROGRESS]\t: %d%%" % (100)
+        print "[PROGRESS]\t: %d%%" % (100)
+    else:
+        if int(iteration) % int(steps) == 0:
+            sys.stdout.write('\r')
+            print "[PROGRESS]\t: %d%%" % (float(int(iteration)/int(max_value)*100)),
+            sys.stdout.flush()
 
 error_d = {
     '0' : '[ERROR:0]\t: File %s does not exist.',