cluster.split fix

[mothur.git] / weighted.h

diff --git a/weighted.h b/weighted.h
index 8a8ad8f2642c35083cba53d6d93e2210f113f7e0..ca9f0378ffc96b545912742e10aab2242651558a 100644 (file)
--- a/weighted.h
+++ b/weighted.h
@@ -22,18 +22,16 @@ 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;
                        int num;
                        linePair(int i, int j) : start(i), num(j) {}
                };
-               vector<linePair*> lines;
+               vector<linePair> lines;
 
                GlobalData* globaldata;
                EstOutput data;
@@ -43,8 +41,9 @@ class Weighted : public TreeCalculator  {
                int processors;
                string outputDir;
                
-               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);
 };
 
 /***********************************************************************/