X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=phylotree.h;h=e0002209e4d83aaaf9468573173858d9b0602b61;hp=2f3745074e170210bfc0b8d6b000361b4a410687;hb=615301e57c25e241356a9c2380648d117709458d;hpb=62cdb3eb996664abdb8fee21bf4a329cd0694867

diff --git a/phylotree.h b/phylotree.h
index 2f37450..e000220 100644
--- a/phylotree.h
+++ b/phylotree.h
@@ -41,16 +41,20 @@ public:
 	vector<int> getGenusTotals();	
 	void setUp(string);  //used to create file needed for summary file if you use () constructor and add seqs manually instead of passing taxonomyfile
 		
-	TaxNode get(int i)				{	return tree[i];							}
-	TaxNode get(string seqName)		{	return tree[name2Taxonomy[seqName]];	}
-	int getIndex(string seqName)	{	return name2Taxonomy[seqName];			}
-	string getName(int i)			{	return tree[i].name;					}
+	TaxNode get(int i);				
+	TaxNode get(string seqName);
+	string getName(int i);			
+	int getGenusIndex(string seqName);	
 	string getFullTaxonomy(string);	 //pass a sequence name return taxonomy
-	int getMaxLevel()				{	return maxLevel;						}
-	int getNumSeqs()  {  return numSeqs;  }
+	
+	int getMaxLevel()		{	return maxLevel;	}
+	int getNumSeqs()		{	return numSeqs;		}
+	int getNumNodes()		{	return tree.size();	}
+	
+	bool ErrorCheck(vector<string>);
 	
 private:
-	string getNextTaxon(string&);
+	string getNextTaxon(string&, string);
 	void print(ofstream&, vector<TaxNode>&); //used to create static reference taxonomy file
 	void fillOutTree(int, vector<TaxNode>&); //used to create static reference taxonomy file
 	void binUnclassified(string);
@@ -59,7 +63,8 @@ private:
 	vector<int> genusIndex; //holds the indexes in tree where the genus level taxonomies are stored
 	vector<int> totals; //holds the numSeqs at each genus level taxonomy
 	map<string, int> name2Taxonomy;  //maps name to index in tree
-	map<int, int> uniqueTaxonomies;  //map of unique taxonomies
+    map<string, int> name2GenusNodeIndex;
+	set<int> uniqueTaxonomies;  //map of unique taxonomies
 	map<int, int> leafNodes; //used to create static reference taxonomy file
 	//void print(int, ofstream&);
 	int numNodes;