took out debugging output code from distance calculators

[mothur.git] / rarefact.h

diff --git a/rarefact.h b/rarefact.h
index fc1e8d13e4b289851c65e72a1ebd1804edfbd44d..20c19251b132dd8ba512ab1530206546eb0bbbec 100644 (file)
--- a/rarefact.h
+++ b/rarefact.h
@@ -1,28 +1,26 @@
 #ifndef RAREFACT_H
 #define RAREFACT_H
 
-using namespace std;
-
 #include "rarefactioncurvedata.h"
 #include "raredisplay.h"
 #include "ordervector.hpp"
 #include "mothur.h"
+#include "globaldata.hpp"
 
 
 class Rarefact {
        
 public:
        Rarefact(OrderVector* o, vector<Display*> disp) :
-                       numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel())  {};
-       Rarefact(SharedOrderVector* sharedorder, vector<Display*> disp) :
-                                       numSeqs(sharedorder->getNumSeqs()), sharedorder(sharedorder), displays(disp), label(sharedorder->getLabel())  {};
+                       numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel())  { m = MothurOut::getInstance(); }
+       Rarefact(vector<SharedRAbundVector*> shared, vector<Display*> disp) :
+                                        lookup(shared), displays(disp) {  globaldata = GlobalData::getInstance(); m = MothurOut::getInstance(); }
 
        ~Rarefact(){};
-       void getCurve(int, int);
-       void getSharedCurve(int, int);
+       int getCurve(float, int);
+       int getSharedCurve(float, int);
        
 private:
-       SharedOrderVector* sharedorder;
        GlobalData* globaldata;
        OrderVector* order;
        vector<Display*> displays;
@@ -30,6 +28,7 @@ private:
        string label;
        void mergeVectors(SharedRAbundVector*, SharedRAbundVector*);
        vector<SharedRAbundVector*> lookup; 
+       MothurOut* m;
 
 };