committing so I can work on the other machine

[mothur.git] / treecalculator.h

diff --git a/treecalculator.h b/treecalculator.h
index 133330c46d1e0a75529eeb54aa577c9777f8c180..86cb52798a291990ea7d0d20adfdf9c14f0ea569 100644 (file)
--- a/treecalculator.h
+++ b/treecalculator.h
@@ -10,11 +10,9 @@
  *
  */
 
-using namespace std;
-
 #include "mothur.h"
-#include "utilities.hpp"
 #include "tree.h"
+#include "mothurout.h"
 
 /* The tree calculator class is the parent class for tree calculators in mothur. */ 
 
@@ -25,19 +23,21 @@ typedef vector<double> EstOutput;
 class TreeCalculator {
 
 public:
-       TreeCalculator(){};
+       TreeCalculator(){ m = MothurOut::getInstance(); }
        TreeCalculator(string n) : name(n) {};
-       ~TreeCalculator(){};
+       virtual ~TreeCalculator(){};
        virtual EstOutput getValues(Tree*) = 0; 
+       virtual EstOutput getValues(Tree*, string, string) = 0;
        
        virtual string getName()                {       return name;    }
                
 protected:
        EstOutput data;
        string name;
+       MothurOut* m;
 
 };
 
 /***********************************************************************/
 
-#endif
\ No newline at end of file
+#endif