X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=mothur.h;h=98b34c31c58c88b614412be4e9ba6874ec1cbe36;hp=57ece6785e1e798e310797b747e6b8d049c0113d;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=e0dc0bcef2a0f7e1f63abb531dbb1ad533da98ca

diff --git a/mothur.h b/mothur.h
index 57ece67..98b34c3 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>
@@ -87,6 +88,7 @@ using namespace std;
 
 
 typedef unsigned long ull;
+typedef unsigned short intDist;
 
 struct IntNode {
 	int lvalue;
@@ -106,6 +108,25 @@ 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 PDistCell{
+	ull index;
+	float dist;
+	PDistCell() :  index(0), dist(0) {};
+	PDistCell(ull c, float d) :  index(c), dist(d) {}
+};
 /************************************************************/
 struct clusterNode {
 	int numSeq;
@@ -117,9 +138,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() {}
 };
 /************************************************************/
@@ -144,21 +165,26 @@ struct spearmanRank {
 	
 	spearmanRank(string n, float s) : name(n), score(s) {}
 };
+//***********************************************************************
+inline bool compareIndexes(PDistCell left, PDistCell right){
+	return (left.index > right.index);	
+}
 //********************************************************************************************************************
-//sorts highest to lowest
 inline bool compareSpearman(spearmanRank left, spearmanRank right){
-	return (left.score > right.score);	
+	return (left.score < right.score);	
 } 
 //********************************************************************************************************************
 //sorts highest to lowest
 inline bool compareSeqPriorityNodes(seqPriorityNode left, seqPriorityNode right){
-	return (left.numIdentical > right.numIdentical);	
-} 
-//********************************************************************************************************************
-//sorts lowest to highest
-inline bool compareSpearmanReverse(spearmanRank left, spearmanRank right){
-	return (left.score < right.score);	
+	if (left.numIdentical > right.numIdentical) {
+        return true;
+    }else if (left.numIdentical == right.numIdentical) {
+        if (left.seq > right.seq) { return true; }
+        else { return false; }
+    }
+    return false;	
 } 
+ 
 /************************************************************/
 //sorts lowest to highest
 inline bool compareDistLinePairs(distlinePair left, distlinePair right){
@@ -189,7 +215,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>