fixed some bugs

[mothur.git] / treecalculator.h

diff --git a/treecalculator.h b/treecalculator.h
index 0bc41d9a2bc27db88a40c03bd40278692de88366..35d061c382f9857e7cfac0c965fb4f1935c7715c 100644 (file)
--- a/treecalculator.h
+++ b/treecalculator.h
@@ -10,15 +10,7 @@
  *
  */
 
-using namespace std;
-
-#include <vector>
-#include <cmath>
-#include <math.h>
-#include <string>
-#include <map>
-#include <algorithm>
-#include "utilities.hpp"
+#include "mothur.h"
 #include "tree.h"
 
 /* The tree calculator class is the parent class for tree calculators in mothur. */ 
@@ -32,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;    }