X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=wiggle.cpp;h=4e68b4400f354c0160de91579c6d18906c641892;hb=8ca5b7c2fb57bc523431c1e37d5ab9337eccbc37;hp=65a3d4a783e1ffd44e3b534c890113138aff8aee;hpb=fc69cf6af24c0550e55447fc82f01cb6f90c1c42;p=rsem.git

diff --git a/wiggle.cpp b/wiggle.cpp
index 65a3d4a..4e68b44 100644
--- a/wiggle.cpp
+++ b/wiggle.cpp
@@ -1,16 +1,27 @@
 #include <cstring>
 #include <cstdlib>
 #include <cassert>
+#include <iostream>
 
 #include <stdint.h>
 #include "sam/bam.h"
 #include "sam/sam.h"
 
+#include "utils.h"
 #include "wiggle.h"
 
+bool no_fractional_weight = false;
+
 void add_bam_record_to_wiggle(const bam1_t *b, Wiggle& wiggle) {
-    uint8_t *p_tag = bam_aux_get(b, "ZW");
-    float w = (p_tag != NULL ? bam_aux2f(p_tag) : 1.0);
+    float w;
+
+    if (no_fractional_weight) w = 1.0;
+    else {
+      uint8_t *p_tag = bam_aux_get(b, "ZW");
+      if (p_tag == NULL) return;
+      w = bam_aux2f(p_tag);
+    }
+
     int pos = b->core.pos;
     uint32_t *p = bam1_cigar(b);
     
@@ -41,23 +52,23 @@ void build_wiggles(const std::string& bam_filename,
 	bool *used = new bool[header->n_targets];
 	memset(used, 0, sizeof(bool) * header->n_targets);
 
-    int cur_tid = -1; //current tid;
-	int cnt = 0;
-    bam1_t *b = bam_init1();
-    Wiggle wiggle;
+	int cur_tid = -1; //current tid;
+	HIT_INT_TYPE cnt = 0;
+	bam1_t *b = bam_init1();
+	Wiggle wiggle;
 	while (samread(bam_in, b) >= 0) {
 		if (b->core.flag & 0x0004) continue;
 
 		if (b->core.tid != cur_tid) {
 			if (cur_tid >= 0) { used[cur_tid] = true; processor.process(wiggle); }
 			cur_tid = b->core.tid;
-            wiggle.name = header->target_name[cur_tid];
-            wiggle.length = header->target_len[cur_tid];
-            wiggle.read_depth.assign(wiggle.length, 0.0);
+			wiggle.name = header->target_name[cur_tid];
+			wiggle.length = header->target_len[cur_tid];
+			wiggle.read_depth.assign(wiggle.length, 0.0);
 		}
-        add_bam_record_to_wiggle(b, wiggle);
+		add_bam_record_to_wiggle(b, wiggle);
 		++cnt;
-		if (cnt % 1000000 == 0) fprintf(stderr, "%d FIN\n", cnt);
+		if (cnt % 1000000 == 0) std::cout<< cnt<< std::endl;
 	}
 	if (cur_tid >= 0) { used[cur_tid] = true; processor.process(wiggle); }