line and label no longer persist between commands. Added phylip formated output...

[mothur.git] / calculator.h

diff --git a/calculator.h b/calculator.h
index 4cc32806ff7536908c5f75a233e255dd321dd72a..8b21f7071a40df4a7202176d4132d3f2d6173adc 100644 (file)
--- a/calculator.h
+++ b/calculator.h
@@ -1,7 +1,6 @@
 #ifndef CALCULATOR_H
 #define CALCULATOR_H
 
-using namespace std;
 
 #include "mothur.h"
 #include "sabundvector.hpp"
@@ -14,7 +13,6 @@ It has 2 pure functions EstOutput getValues(SAbundVector*), which works on a sin
 EstOutput getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2), which compares 2 groups. */ 
 
 
-using namespace std;
 typedef vector<double> EstOutput;
 
 /***********************************************************************/
@@ -23,17 +21,19 @@ class Calculator {
 
 public:
        Calculator(){};
-       Calculator(string n, int c) : name(n), cols(c) {};
+       Calculator(string n, int c, bool m) : name(n), cols(c), multiple(m) {};
        virtual EstOutput getValues(SAbundVector*) = 0; 
-       virtual EstOutput getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) = 0;
+       virtual EstOutput getValues(vector<SharedRAbundVector*>) = 0;
        virtual void print(ostream& f)  { f.setf(ios::fixed, ios::floatfield); f.setf(ios::showpoint);
                                                                          f << data[0]; for(int i=1;i<data.size();i++){ f << '\t' << data[i];   }}
        virtual string getName()                {       return name;    }
        virtual int getCols()           {       return cols;    }
+       virtual bool getMultiple()  {   return multiple;   }
 protected:
        EstOutput data;
        string name;
        int cols;
+       bool multiple;
 
 };