added tree reader class to handle reading trees. Reworked the tree map to tree class...

[mothur.git] / unweighted.h

diff --git a/unweighted.h b/unweighted.h
index e751d2e79d19f17a2dd3a9af34ea11be95586ef4..c6c13bb3a7abd14c824dfe6b495871790809833d 100644 (file)
--- a/unweighted.h
+++ b/unweighted.h
@@ -19,7 +19,7 @@
 class Unweighted : public TreeCalculator  {
        
        public:
-               Unweighted(TreeMap* t, bool r) : tmap(t), includeRoot(r) {};
+        Unweighted(bool r) : includeRoot(r) {};
                ~Unweighted() {};
                EstOutput getValues(Tree*, int, string);
                EstOutput getValues(Tree*, string, string, int, string);
@@ -33,16 +33,15 @@ class Unweighted : public TreeCalculator  {
                vector<linePair> lines;
                
                EstOutput data;
-               TreeMap* tmap;
                int processors;
                string outputDir;
                map< vector<string>, set<int> > rootForGrouping;  //maps a grouping combo to the roots 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, bool); 
-               EstOutput createProcesses(Tree*, vector< vector<string> >, bool);
+               EstOutput driver(Tree*, vector< vector<string> >, int, int, TreeMap*); 
+               EstOutput createProcesses(Tree*, vector< vector<string> >, TreeMap*);
+               EstOutput driver(Tree*, vector< vector<string> >, int, int, bool, TreeMap*); 
+               EstOutput createProcesses(Tree*, vector< vector<string> >, bool, TreeMap*);
                int getRoot(Tree*, int, vector<string>);
 };