test change

[mothur.git] / mothur.h

diff --git a/mothur.h b/mothur.h
index 25b803fa393e27d0c2811e62efdeb042ce390dec..dcdd76b21a883ca7a65b2780e9e395212464f925 100644 (file)
--- a/mothur.h
+++ b/mothur.h
@@ -127,6 +127,21 @@ struct PDistCell{
        PDistCell() :  index(0), dist(0) {};
        PDistCell(ull c, float d) :  index(c), dist(d) {}
 };
+/***********************************************************************/
+struct consTax{
+       string name;
+    string taxonomy;
+    int abundance;
+       consTax() :  name(""), taxonomy("unknown"), abundance(0) {};
+       consTax(string n, string t, int a) :  name(n), taxonomy(t), abundance(a) {}
+};
+/***********************************************************************/
+struct consTax2{
+    string taxonomy;
+    int abundance;
+       consTax2() :  taxonomy("unknown"), abundance(0) {};
+       consTax2(string t, int a) :  taxonomy(t), abundance(a) {}
+};
 /************************************************************/
 struct clusterNode {
        int numSeq;
@@ -170,20 +185,21 @@ 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);      
 } 
 //********************************************************************************************************************
 //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){