fixed some issues while testing 1.6

[mothur.git] / treecalculator.h

diff --git a/treecalculator.h b/treecalculator.h
index 133330c46d1e0a75529eeb54aa577c9777f8c180..797c45723f835fea908fe2829397b682edc32c6f 100644 (file)
--- a/treecalculator.h
+++ b/treecalculator.h
@@ -10,10 +10,7 @@
  *
  */
 
-using namespace std;
-
 #include "mothur.h"
-#include "utilities.hpp"
 #include "tree.h"
 
 /* The tree calculator class is the parent class for tree calculators in mothur. */ 
@@ -27,8 +24,9 @@ class TreeCalculator {
 public:
        TreeCalculator(){};
        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;    }
                
@@ -40,4 +38,4 @@ protected:
 
 /***********************************************************************/
 
-#endif
\ No newline at end of file
+#endif