X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unweighted.h;h=f27df8c9495d36ea9b98f74b521316af95271a0f;hb=bd93b1a6f9fe9a6a4a7ac2e9f106e5c83a438856;hp=e3bf3a8fc240648e4a38f48ced539845d3648706;hpb=b2dca66a02f8f82aa5528e531eace60fbbd2967b;p=mothur.git

diff --git a/unweighted.h b/unweighted.h
index e3bf3a8..f27df8c 100644
--- a/unweighted.h
+++ b/unweighted.h
@@ -21,19 +21,29 @@ class Unweighted : public TreeCalculator  {
 	public:
 		Unweighted(TreeMap* t) : tmap(t) {};
 		~Unweighted() {};
-		EstOutput getValues(Tree*);
+		EstOutput getValues(Tree*, int, string);
+		EstOutput getValues(Tree*, string, string);
 		
 	private:
+		struct linePair {
+			int start;
+			int num;
+			linePair(int i, int j) : start(i), num(j) {}
+		};
+		vector<linePair*> lines;
+		
 		GlobalData* globaldata;
+		Tree* copyTree;
 		EstOutput data;
-		vector<int> penalty;
 		TreeMap* tmap;
-		bool inUsersGroups(string);
+		int processors;
+		string outputDir;
+		
+		EstOutput driver(Tree*, vector< vector<string> >, int, int); 
+		EstOutput createProcesses(Tree*, vector< vector<string> >);
 
 };
 
 /***********************************************************************/
 
-
-
-#endif
\ No newline at end of file
+#endif