X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=treecalculator.h;h=06abdb8e278e5dd4c04536444745f5f71679f092;hp=0bc41d9a2bc27db88a40c03bd40278692de88366;hb=050a3ff02473a3d4c0980964e1a9ebe52e55d6b8;hpb=d037597badc8d18e235c59f0c1114180edb7f98f

diff --git a/treecalculator.h b/treecalculator.h
index 0bc41d9..06abdb8 100644
--- a/treecalculator.h
+++ b/treecalculator.h
@@ -10,16 +10,9 @@
  *
  */
 
-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"
+#include "mothurout.h"
 
 /* The tree calculator class is the parent class for tree calculators in mothur. */ 
 
@@ -30,19 +23,24 @@ typedef vector<double> EstOutput;
 class TreeCalculator {
 
 public:
-	TreeCalculator(){};
+	TreeCalculator(){ m = MothurOut::getInstance(); }
 	TreeCalculator(string n) : name(n) {};
-	~TreeCalculator(){};
-	virtual EstOutput getValues(Tree*) = 0;	
+	
+	virtual ~TreeCalculator(){};
+	virtual EstOutput getValues(Tree*) { return data; }	
+	virtual EstOutput getValues(Tree*, int, string) { return data; }	
+	virtual EstOutput getValues(Tree*, string, string) { return data; }
+	virtual EstOutput getValues(Tree*, string, string, vector<double>&) { return data; }
 	
 	virtual string getName()		{	return name;	}
 		
 protected:
 	EstOutput data;
 	string name;
+	MothurOut* m;
 
 };
 
 /***********************************************************************/
 
-#endif
\ No newline at end of file
+#endif