X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.h;h=2c143e8667786c5740f0aa6324ea4062eab66b76;hb=a6cf29fa4dac0909c7582cb1094151d34093ee76;hp=3b7c4599329aede91be3f6325d27df1accf77c03;hpb=d0051dc9939d3477bd92b42c86bcd3eda743b955;p=mothur.git

diff --git a/mothur.h b/mothur.h
index 3b7c459..2c143e8 100644
--- a/mothur.h
+++ b/mothur.h
@@ -42,6 +42,7 @@
 #include <cmath>
 #include <math.h>
 #include <algorithm>
+#include <numeric>
 
 //misc
 #include <cerrno>
@@ -53,7 +54,7 @@
 #endif
 /***********************************************************************/
 
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 	#include <sys/wait.h>
 	#include <sys/time.h>
 	#include <sys/resource.h>
@@ -106,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;
@@ -117,9 +131,9 @@ struct clusterNode {
 struct seqDist {
 	int seq1;
 	int seq2;
-	float dist;
+	double dist;
 	seqDist() {}
-	seqDist(int s1, int s2, float d) : seq1(s1), seq2(s2), dist(d) {}
+	seqDist(int s1, int s2, double d) : seq1(s1), seq2(s2), dist(d) {}
 	~seqDist() {}
 };
 /************************************************************/