X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=weighted.h;h=c23a11599b4b8d74fdfacd05a5a02ae727834455;hb=2bb9267aa4b4ecdf8488b06605cc9f3f36fa4332;hp=11cd26b2d9642cb2679a0f3dfc06d930c15127f0;hpb=c53ef46b40b97c00e32bfd8c3924ce8c51b5cd7b;p=mothur.git

diff --git a/weighted.h b/weighted.h
index 11cd26b..c23a115 100644
--- a/weighted.h
+++ b/weighted.h
@@ -19,7 +19,7 @@
 class Weighted : public TreeCalculator  {
 	
 	public:
-		Weighted(TreeMap* t) : tmap(t) {};
+		Weighted(TreeMap* t, bool r) : tmap(t), includeRoot(r) {};
 		~Weighted() {};
 		
 		EstOutput getValues(Tree*, string, string);
@@ -33,7 +33,6 @@ class Weighted : public TreeCalculator  {
 		};
 		vector<linePair> lines;
 
-		GlobalData* globaldata;
 		EstOutput data;
 		TreeMap* tmap;
 		map<string, int>::iterator it;
@@ -41,6 +40,7 @@ class Weighted : public TreeCalculator  {
 		int processors;
 		string outputDir;
 		map< vector<string>, set<int> > rootForGrouping;  //maps a grouping combo to the root for that combo
+		bool includeRoot;
 		
 		EstOutput driver(Tree*, vector< vector<string> >, int, int); 
 		EstOutput createProcesses(Tree*, vector< vector<string> >);