X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothur.h;h=25b803fa393e27d0c2811e62efdeb042ce390dec;hb=6ede3bf5c0a9eedb23f24577a97da81ab3e1f7df;hp=57b409e51605df2d0dbab805e3d8b1b7060e7b3e;hpb=597560b3c23f03d0069082cf096ce65e0c087519;p=mothur.git

diff --git a/mothur.h b/mothur.h
index 57b409e..25b803f 100644
--- a/mothur.h
+++ b/mothur.h
@@ -54,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>
@@ -88,6 +88,7 @@ using namespace std;
 
 
 typedef unsigned long ull;
+typedef unsigned short intDist;
 
 struct IntNode {
 	int lvalue;
@@ -119,7 +120,13 @@ struct diffPair {
 		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;
@@ -131,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() {}
 };
 /************************************************************/
@@ -158,10 +165,14 @@ 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