X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=weighted.h;h=8a8ad8f2642c35083cba53d6d93e2210f113f7e0;hb=f099fdc1e3a0d7b75d780a164e5bdb93496a7a1d;hp=41b738b00be222d8f7075af9a0621733c6bcf2fc;hpb=5a3592c6478d5d786ec20e4bee71854ad92fdb8c;p=mothur.git

diff --git a/weighted.h b/weighted.h
index 41b738b..8a8ad8f 100644
--- a/weighted.h
+++ b/weighted.h
@@ -21,18 +21,33 @@ class Weighted : public TreeCalculator  {
 	public:
 		Weighted(TreeMap* t) : tmap(t) {};
 		~Weighted() {};
-		EstOutput getValues(Tree*);
-		EstOutput getValues(Tree*, string, string);
+		
+		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