X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=weighted.h;h=11cd26b2d9642cb2679a0f3dfc06d930c15127f0;hb=af27acb766f6947c45e1eb65438d878c7ea48ef3;hp=3fa5123a59363ce4697fbead42522e35b78667b9;hpb=a98eb683e17d8e49583bf2d215ab7562a4cdca75;p=mothur.git

diff --git a/weighted.h b/weighted.h
index 3fa5123..11cd26b 100644
--- a/weighted.h
+++ b/weighted.h
@@ -22,11 +22,9 @@ class Weighted : public TreeCalculator  {
 		Weighted(TreeMap* t) : tmap(t) {};
 		~Weighted() {};
 		
-		EstOutput getValues(Tree*, string, string, vector<double>&);
+		EstOutput getValues(Tree*, string, string);
 		EstOutput getValues(Tree*, int, string);
 		
-		vector<double> getBranchLengthSums(Tree*);
-		
 	private:
 		struct linePair {
 			int start;
@@ -42,9 +40,11 @@ class Weighted : public TreeCalculator  {
 		map<string, double> WScore; //a score for each group combination i.e. AB, AC, BC.
 		int processors;
 		string outputDir;
+		map< vector<string>, set<int> > rootForGrouping;  //maps a grouping combo to the root for that combo
 		
-		EstOutput driver(Tree*, vector< vector<string> >, int, int, vector<double>&); 
-		EstOutput createProcesses(Tree*, vector< vector<string> >, vector<double>&);
+		EstOutput driver(Tree*, vector< vector<string> >, int, int); 
+		EstOutput createProcesses(Tree*, vector< vector<string> >);
+		double getLengthToRoot(Tree*, int, string, string);
 };
 
 /***********************************************************************/