X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.h;h=57b409e51605df2d0dbab805e3d8b1b7060e7b3e;hb=597560b3c23f03d0069082cf096ce65e0c087519;hp=53074eb1e146f28af23a87e6888d57bfaa5184fa;hpb=64581f6d0e63e67d4e119601bea695ebb3f52a13;p=mothur.git

diff --git a/mothur.h b/mothur.h
index 53074eb..57b409e 100644
--- a/mothur.h
+++ b/mothur.h
@@ -42,6 +42,7 @@
 #include <cmath>
 #include <math.h>
 #include <algorithm>
+#include <numeric>
 
 //misc
 #include <cerrno>
@@ -72,6 +73,8 @@
 	#include <windows.h>
 	#include <psapi.h>
 	#include <direct.h>
+	#include <tchar.h>
+
 #endif
 
 using namespace std;
@@ -83,6 +86,7 @@ using namespace std;
 #define isnan(x) ((x) != (x))
 #define isinf(x) (fabs(x) == std::numeric_limits<double>::infinity())
 
+
 typedef unsigned long ull;
 
 struct IntNode {
@@ -103,6 +107,19 @@ struct ThreadNode {
 	IntNode* right;
 };
 
+struct diffPair {
+	float	prob;
+	float	reverseProb;
+	
+	diffPair() {
+		prob = 0; reverseProb = 0;
+	}
+	diffPair(float p, float rp) {
+		prob = p;
+		reverseProb = rp;
+	}
+};
+
 /************************************************************/
 struct clusterNode {
 	int numSeq;
@@ -186,7 +203,8 @@ void convert(const string& s, T& x, bool failIfLeftoverChars = true){
 			throw BadConversion(s);
 	
 }
-
+//**********************************************************************************************************************
+template <typename T> int sgn(T val){ return (val > T(0)) - (val < T(0)); }
 //**********************************************************************************************************************
 
 template<typename T>