X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=tree.h;h=2d9d4f815f90bd889c10b886853ca415840060f5;hb=8dd3c225255d7084e3aff8740aa4f1f1cabb367a;hp=ac57a4a8168701e5d9f285537a8550de3f946bfa;hpb=f18d75f9c996cb619a5051a7664620c0c5ae05fb;p=mothur.git

diff --git a/tree.h b/tree.h
index ac57a4a..2d9d4f8 100644
--- a/tree.h
+++ b/tree.h
@@ -10,20 +10,19 @@
  *
  */
 
-using namespace std;
-
 #include "treenode.h"
-#include "globaldata.hpp"
-
+#include "treemap.h"
 /* This class represents the treefile. */
 
 class Tree {
 public: 
-	Tree();		//to generate a tree from a file
+	Tree(string);  //do not use tree generated by this constructor its just to extract the treenames, its a chicken before the egg thing that needs to be revisited.
+	Tree(int, TreeMap*); 
+	Tree(TreeMap*);		//to generate a tree from a file
 	~Tree();
 	
-	
 	void getCopy(Tree*);  //makes tree a copy of the one passed in.
+	void getSubTree(Tree*, vector<string>);  //makes tree a that contains only the names passed in.
 	void assembleRandomTree();
 	void assembleRandomUnifracTree(vector<string>);
 	void assembleRandomUnifracTree(string, string);
@@ -34,27 +33,43 @@ public:
 	int getNumLeaves(){	return numLeaves; }
 	map<string, int> mergeUserGroups(int, vector<string>);  //returns a map with a groupname and the number of times that group was seen in the children
 	void printTree();
+	void print(ostream&);
+	void print(ostream&, string);
+	int findRoot();  //return index of root node
 	
 	//this function takes the leaf info and populates the non leaf nodes
-	void assembleTree();		
+	int assembleTree();	
+	int assembleTree(string);	
 	
 	vector<Node> tree;		//the first n nodes are the leaves, where n is the number of sequences.
+	map< string, vector<int> > groupNodeInfo;	//maps group to indexes of leaf nodes with that group, different groups may contain same node because of names file.
+			
 private:
-	GlobalData* globaldata;
+	TreeMap* tmap;
 	int numNodes, numLeaves;
 	ofstream out;
 	string filename;
 	
 	map<string, int>::iterator it, it2;
 	map<string, int> mergeGroups(int);  //returns a map with a groupname and the number of times that group was seen in the children
+	map<string,int> mergeGcounts(int);
 	
-	map<string,int> Tree::mergeGcounts(int);
+	void addNamesToCounts();
 	void randomTopology();
 	void randomBlengths();
 	void randomLabels(vector<string>);
-	void randomLabels(string, string);
-	int findRoot();  //return index of root node
-	void printBranch(int);  //recursively print out tree
+	//void randomLabels(string, string);
+	void printBranch(int, ostream&, string);  //recursively print out tree
+	void parseTreeFile();	//parses through tree file to find names of nodes and number of them
+							//this is required in case user has sequences in the names file that are
+							//not included in the tree. 
+							//only takes names from the first tree in the tree file and assumes that all trees use the same names.
+	int readTreeString(ifstream&);
+	int populateNewTree(vector<Node>&, int, int&);
+	void printBranch(int, ostream&, string, vector<Node>&);
+		
+	MothurOut* m;
+		
 };
 
 #endif