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

diff --git a/unweighted.h b/unweighted.h
index f27df8c..f413261 100644
--- a/unweighted.h
+++ b/unweighted.h
@@ -22,7 +22,7 @@ class Unweighted : public TreeCalculator  {
 		Unweighted(TreeMap* t) : tmap(t) {};
 		~Unweighted() {};
 		EstOutput getValues(Tree*, int, string);
-		EstOutput getValues(Tree*, string, string);
+		EstOutput getValues(Tree*, string, string, int, string);
 		
 	private:
 		struct linePair {
@@ -30,10 +30,9 @@ class Unweighted : public TreeCalculator  {
 			int num;
 			linePair(int i, int j) : start(i), num(j) {}
 		};
-		vector<linePair*> lines;
+		vector<linePair> lines;
 		
 		GlobalData* globaldata;
-		Tree* copyTree;
 		EstOutput data;
 		TreeMap* tmap;
 		int processors;
@@ -41,6 +40,8 @@ class Unweighted : public TreeCalculator  {
 		
 		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);
 
 };