X-Git-Url: https://git.donarmstrong.com/?p=rsem.git;a=blobdiff_plain;f=utils.h;h=137440ef82a42590460c965a1a61d7ead70e4af0;hp=278e95e9272ca67f36de745dc924f40fd7085ca6;hb=412c1a2821c5a4cbe2e68e4e9f4e2026a86d25f7;hpb=635ca2939cfb1f519f19e9dec072ddd05e9fb450

diff --git a/utils.h b/utils.h
index 278e95e..137440e 100644
--- a/utils.h
+++ b/utils.h
@@ -10,6 +10,10 @@
 #include<cassert>
 #include<string>
 #include<vector>
+#include<stdint.h>
+
+typedef uint64_t HIT_INT_TYPE;
+typedef uint64_t READ_INT_TYPE;
 
 const int STRLEN = 10005 ;
 const double EPSILON = 1e-300;
@@ -19,7 +23,7 @@ const int RANGE = 201;
 const int OLEN = 25; // overlap length, number of bases must not be in poly(A) tails
 const int NBITS = 32; // use unsigned int, 32 bits per variable
 
-bool verbose = true; // show detail intermediate outputs
+static bool verbose = true; // show detail intermediate outputs
 
 inline bool isZero(double a) { return fabs(a) < 1e-8; }
 inline bool isLongZero(double a) { return fabs(a) < 1e-30; }
@@ -120,21 +124,7 @@ inline std::string cleanStr(const std::string& str) {
   return (fr <= to ? str.substr(fr, to - fr + 1) : "");
 }
 
-void printTimeUsed(const time_t& a, const time_t& b, const char* filename = "") {
-	int hh = (b - a) / 3600;
-	int mm = (b - a) % 3600 / 60;
-	int ss = (b - a) % 60;
-
-	printf("Time Used : %d h %02d m %02d s\n", hh, mm, ss);
-
-	if (strcmp(filename, "")) {
-		FILE *fo = fopen(filename, "w");
-		fprintf(fo, "Time Used : %d h %02d m %02d s\n", hh, mm, ss);
-		fclose(fo);
-	}
-}
-
-void genReadFileNames(const char* readFN, int tagType, int read_type, int& s, char readFs[][STRLEN]){
+inline void genReadFileNames(const char* readFN, int tagType, int read_type, int& s, char readFs[][STRLEN]){
 	const char tags[3][STRLEN] = {"un", "alignable", "max"};
 	char suffix[STRLEN];
 
@@ -156,4 +146,12 @@ void genReadFileNames(const char* readFN, int tagType, int read_type, int& s, ch
 	}
 }
 
+inline void printTimeUsed(const time_t& a, const time_t& b, const char* program_name) {
+	int hh = (b - a) / 3600;
+	int mm = (b - a) % 3600 / 60;
+	int ss = (b - a) % 60;
+
+	printf("Time Used for %s : %d h %02d m %02d s\n", program_name, hh, mm, ss);
+}
+
 #endif