X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unweighted.h;h=e751d2e79d19f17a2dd3a9af34ea11be95586ef4;hb=2bb9267aa4b4ecdf8488b06605cc9f3f36fa4332;hp=b6f225f07392fde58d7afd46536562ee5514b104;hpb=d97b619c4297b1274c754d73a64792ba656b0a79;p=mothur.git

diff --git a/unweighted.h b/unweighted.h
index b6f225f..e751d2e 100644
--- a/unweighted.h
+++ b/unweighted.h
@@ -19,19 +19,33 @@
 class Unweighted : public TreeCalculator  {
 	
 	public:
-		Unweighted(TreeMap* t) : tmap(t) {};
+		Unweighted(TreeMap* t, bool r) : tmap(t), includeRoot(r) {};
 		~Unweighted() {};
-		EstOutput getValues(Tree*);
+		EstOutput getValues(Tree*, int, string);
+		EstOutput getValues(Tree*, string, string, int, string);
 		
 	private:
-		GlobalData* globaldata;
+		struct linePair {
+			int start;
+			int num;
+			linePair(int i, int j) : start(i), num(j) {}
+		};
+		vector<linePair> lines;
+		
 		EstOutput data;
 		TreeMap* tmap;
-
+		int processors;
+		string outputDir;
+		map< vector<string>, set<int> > rootForGrouping;  //maps a grouping combo to the roots for that combo
+		bool includeRoot;
+		
+		EstOutput driver(Tree*, vector< vector<string> >, int, int); 
+		EstOutput createProcesses(Tree*, vector< vector<string> >);
+		EstOutput driver(Tree*, vector< vector<string> >, int, int, bool); 
+		EstOutput createProcesses(Tree*, vector< vector<string> >, bool);
+		int getRoot(Tree*, int, vector<string>);
 };
 
 /***********************************************************************/
 
-
-
-#endif
\ No newline at end of file
+#endif