X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=weighted.h;h=3fa5123a59363ce4697fbead42522e35b78667b9;hb=a98eb683e17d8e49583bf2d215ab7562a4cdca75;hp=7e4be7c6d0f4ebc95c7d3a224ba3c5e71a4e6d06;hpb=b2dca66a02f8f82aa5528e531eace60fbbd2967b;p=mothur.git

diff --git a/weighted.h b/weighted.h
index 7e4be7c..3fa5123 100644
--- a/weighted.h
+++ b/weighted.h
@@ -21,17 +21,33 @@ class Weighted : public TreeCalculator  {
 	public:
 		Weighted(TreeMap* t) : tmap(t) {};
 		~Weighted() {};
-		EstOutput getValues(Tree*);
+		
+		EstOutput getValues(Tree*, string, string, vector<double>&);
+		EstOutput getValues(Tree*, int, string);
+		
+		vector<double> getBranchLengthSums(Tree*);
 		
 	private:
+		struct linePair {
+			int start;
+			int num;
+			linePair(int i, int j) : start(i), num(j) {}
+		};
+		vector<linePair> lines;
+
 		GlobalData* globaldata;
 		EstOutput data;
 		TreeMap* tmap;
 		map<string, int>::iterator it;
-		map<string, float> WScore; //a score for each group combination i.e. AB, AC, BC.
+		map<string, double> WScore; //a score for each group combination i.e. AB, AC, BC.
+		int processors;
+		string outputDir;
+		
+		EstOutput driver(Tree*, vector< vector<string> >, int, int, vector<double>&); 
+		EstOutput createProcesses(Tree*, vector< vector<string> >, vector<double>&);
 };
 
 /***********************************************************************/
 
 
-#endif
\ No newline at end of file
+#endif