took out debugging output code from distance calculators

[mothur.git] / rarefact.h

diff --git a/rarefact.h b/rarefact.h
index 6eed91214905f3e8f50b89043c45ea8203b2b808..20c19251b132dd8ba512ab1530206546eb0bbbec 100644 (file)
--- a/rarefact.h
+++ b/rarefact.h
@@ -1,33 +1,34 @@
 #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())  {};
+                       numSeqs(o->getNumSeqs()), order(o), displays(disp), label(o->getLabel())  { m = MothurOut::getInstance(); }
        Rarefact(vector<SharedRAbundVector*> shared, vector<Display*> disp) :
-                                        lookup(shared), displays(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:
+       GlobalData* globaldata;
        OrderVector* order;
        vector<Display*> displays;
        int numSeqs, numGroupComb;
        string label;
        void mergeVectors(SharedRAbundVector*, SharedRAbundVector*);
        vector<SharedRAbundVector*> lookup; 
+       MothurOut* m;
 
 };