unifrac parallelization done, changed dist.seqs output=square to calc all distance...

[mothur.git] / weighted.h

diff --git a/weighted.h b/weighted.h
index 41b738b00be222d8f7075af9a0621733c6bcf2fc..3fa5123a59363ce4697fbead42522e35b78667b9 100644 (file)
--- 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