created mothurOut class to handle logfiles

[mothur.git] / calculator.h

diff --git a/calculator.h b/calculator.h
index ffc92b929f75fe7164301f94f969e384ad9d907a..8d9b8f01afcd580b70d92ccd1b83f0208532bb28 100644 (file)
--- a/calculator.h
+++ b/calculator.h
@@ -7,6 +7,7 @@
 #include "sharedsabundvector.h"
 #include "rabundvector.hpp"
 #include "uvest.h"
+#include "mothurout.h"
 
 /* The calculator class is the parent class for all the different estimators implemented in mothur except the tree calculators.
 It has 2 pure functions EstOutput getValues(SAbundVector*), which works on a single group, and 
@@ -20,9 +21,9 @@ typedef vector<double> EstOutput;
 class Calculator {
 
 public:
-       Calculator(){};
+       Calculator(){ m = MothurOut::getInstance();  }
        virtual ~Calculator(){};
-       Calculator(string n, int c, bool m) : name(n), cols(c), multiple(m) {};
+       Calculator(string n, int c, bool f) : name(n), cols(c), multiple(f) {};
        virtual EstOutput getValues(SAbundVector*) = 0; 
        virtual EstOutput getValues(vector<SharedRAbundVector*>) = 0;
        virtual void print(ostream& f)  { f.setf(ios::fixed, ios::floatfield); f.setf(ios::showpoint);
@@ -31,6 +32,7 @@ public:
        virtual int getCols()           {       return cols;    }
        virtual bool getMultiple()  {   return multiple;   }
 protected:
+       MothurOut* m;
        EstOutput data;
        string name;
        int cols;