testing 1.13.0

[mothur.git] / treecalculator.h

diff --git a/treecalculator.h b/treecalculator.h
index 35d061c382f9857e7cfac0c965fb4f1935c7715c..b2058cbc03a0bc96b72106f51d2dc86a3db9d640 100644 (file)
--- a/treecalculator.h
+++ b/treecalculator.h
@@ -12,6 +12,7 @@
 
 #include "mothur.h"
 #include "tree.h"
+#include "mothurout.h"
 
 /* The tree calculator class is the parent class for tree calculators in mothur. */ 
 
@@ -22,20 +23,25 @@ typedef vector<double> EstOutput;
 class TreeCalculator {
 
 public:
-       TreeCalculator(){};
+       TreeCalculator(){ m = MothurOut::getInstance(); }
        TreeCalculator(string n) : name(n) {};
+       
        virtual ~TreeCalculator(){};
-       virtual EstOutput getValues(Tree*) = 0; 
-       virtual EstOutput getValues(Tree*, string, string) = 0;
+       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;    }
+       virtual vector<double> getBranchLengthSums(Tree*) {  vector<double> temp; return temp;  }
                
 protected:
        EstOutput data;
        string name;
+       MothurOut* m;
 
 };
 
 /***********************************************************************/
 
-#endif
\ No newline at end of file
+#endif