X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=weighted.h;h=d4082fe9c82a7aeeb41aeaad62f016d0ec588d4d;hb=e8e13c129ba8184ec5932a090773f353f3ae3406;hp=d78edf4d49ffd17e24f8eb559747a43952ad522a;hpb=fca3f55d5ded10c3dc77856f3cc4a1c53b02bb6f;p=mothur.git

diff --git a/weighted.h b/weighted.h
index d78edf4..d4082fe 100644
--- a/weighted.h
+++ b/weighted.h
@@ -12,14 +12,14 @@
  */
 
 #include "treecalculator.h"
-#include "treemap.h"
+#include "counttable.h"
 
 /***********************************************************************/
 
 class Weighted : public TreeCalculator  {
 	
 	public:
-		Weighted(TreeMap* t, bool r) : tmap(t), includeRoot(r) {};
+        Weighted( bool r) : includeRoot(r) {};
 		~Weighted() {};
 		
 		EstOutput getValues(Tree*, string, string);
@@ -33,9 +33,7 @@ class Weighted : public TreeCalculator  {
 		};
 		vector<linePair> lines;
 
-		GlobalData* globaldata;
 		EstOutput data;
-		TreeMap* tmap;
 		map<string, int>::iterator it;
 		map<string, double> WScore; //a score for each group combination i.e. AB, AC, BC.
 		int processors;
@@ -43,8 +41,8 @@ class Weighted : public TreeCalculator  {
 		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> >);
+		EstOutput driver(Tree*, vector< vector<string> >, int, int, CountTable*); 
+		EstOutput createProcesses(Tree*, vector< vector<string> >, CountTable*);
 		double getLengthToRoot(Tree*, int, string, string);
 };