added make.lefse command. fixed bug in make.contigs with trimming reverse barcodes...

[mothur.git] / mothur.h

diff --git a/mothur.h b/mothur.h
index cd14056b21ba82f9d6c07e650fcf210616e7a882..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,7 +185,6 @@ 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);      
 } 
@@ -185,11 +199,7 @@ inline bool compareSeqPriorityNodes(seqPriorityNode left, seqPriorityNode right)
     }
     return false;      
 } 
-//********************************************************************************************************************
-//sorts lowest to highest
-inline bool compareSpearmanReverse(spearmanRank left, spearmanRank right){
-       return (left.score < right.score);      
-} 
+ 
 /************************************************************/
 //sorts lowest to highest
 inline bool compareDistLinePairs(distlinePair left, distlinePair right){