working on mgcluster count file change

[mothur.git] / weighted.h

diff --git a/weighted.h b/weighted.h
index 11cd26b2d9642cb2679a0f3dfc06d930c15127f0..180409ce2dbad5da67b570a7ca4a3666c61ae3b3 100644 (file)
--- a/weighted.h
+++ b/weighted.h
@@ -19,7 +19,7 @@
 class Weighted : public TreeCalculator  {
        
        public:
-               Weighted(TreeMap* t) : tmap(t) {};
+        Weighted( bool r) : includeRoot(r) {};
                ~Weighted() {};
                
                EstOutput getValues(Tree*, string, string);
@@ -33,17 +33,16 @@ class Weighted : public TreeCalculator  {
                };
                vector<linePair> lines;
 
-               GlobalData* globaldata;
                EstOutput data;
-               TreeMap* tmap;
                map<string, int>::iterator it;
                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
+               bool includeRoot;
                
-               EstOutput driver(Tree*, vector< vector<string> >, int, int); 
-               EstOutput createProcesses(Tree*, vector< vector<string> >);
+               EstOutput driver(Tree*, vector< vector<string> >, int, int, TreeMap*); 
+               EstOutput createProcesses(Tree*, vector< vector<string> >, TreeMap*);
                double getLengthToRoot(Tree*, int, string, string);
 };