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

[mothur.git] / parsimony.h

diff --git a/parsimony.h b/parsimony.h
index b116aa2d1a55e0ba84571f1f4c9500c6be5d8fcc..7316d508dd52729c8ddec87c34a08c76586cd4d1 100644 (file)
--- a/parsimony.h
+++ b/parsimony.h
@@ -19,10 +19,9 @@
 class Parsimony : public TreeCalculator  {
        
        public:
-               Parsimony(TreeMap* t) : tmap(t) {};
+               Parsimony() {};
                ~Parsimony() {};
                EstOutput getValues(Tree*, int, string);
-               //EstOutput getValues(Tree*, string, string) { return data; }
                
        private:
                struct linePair {
@@ -33,12 +32,11 @@ class Parsimony : public TreeCalculator  {
                vector<linePair> lines;
        
                EstOutput data;
-               TreeMap* tmap;
                int processors;
                string outputDir;
        
-               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*);
 };
 
 /***********************************************************************/