X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=phylosummary.h;h=65a467483ddab1ae58757629644162dc83bab254;hb=70491a12902e89b85cfa6b44a7b7fbe066ee2ac1;hp=9ebdf81ac4fbd06490f05d7be7c15b6f6a5d1179;hpb=cd9dbd8b53bbe32af3e9c6bead4aa6d796a278a5;p=mothur.git

diff --git a/phylosummary.h b/phylosummary.h
index 9ebdf81..65a4674 100644
--- a/phylosummary.h
+++ b/phylosummary.h
@@ -13,6 +13,7 @@
 #include "mothur.h"
 #include "mothurout.h"
 #include "groupmap.h"
+#include "counttable.h"
 
 /**************************************************************************************************/
 
@@ -32,11 +33,15 @@ struct rawTaxNode {
 class PhyloSummary {
 
 public:
-	PhyloSummary(string, string);
-	~PhyloSummary() { if (groupmap != NULL)  {  delete groupmap;  }  }
+	PhyloSummary(GroupMap*);
+	PhyloSummary(string, GroupMap*);
+    PhyloSummary(CountTable*);
+	PhyloSummary(string, CountTable*);
+	~PhyloSummary() {}
 	
-	void summarize(string);  //pass it a taxonomy file and a group file and it makes the tree
+	int summarize(string);  //pass it a taxonomy file and a group file and it makes the tree
 	int addSeqToTree(string, string);
+	int addSeqToTree(string, map<string, bool>);
 	void print(ofstream&);
 	int getMaxLevel() { return maxLevel; }
 	
@@ -47,6 +52,8 @@ private:
 	void assignRank(int);
 	void readTreeStruct(ifstream&);
 	GroupMap* groupmap;
+    CountTable* ct;
+	bool ignore;
 	
 	int numNodes;
 	int numSeqs;