changes while testing

[mothur.git] / raredisplay.h

diff --git a/raredisplay.h b/raredisplay.h
index ff7de73f24146a3b9d8401712c330adabcd8288d..6d07efc55ab9ab677bb9f3604f46862d02984e16 100644 (file)
--- a/raredisplay.h
+++ b/raredisplay.h
@@ -6,33 +6,29 @@
 #include "fileoutput.h"
 #include "display.h"
 
-
-using namespace std;
-
 /***********************************************************************/
 
 class RareDisplay : public Display {
        
 public:
-       RareDisplay(Calculator* calc, FileOutput* file) : estimate(calc), output(file), nIters(1),
-                                                       tempInName(getPathName(output->getFileName()) + ".tempin."+ getSimpleName(output->getFileName())), tempOutName(getPathName(output->getFileName()) + ".tempout."+ getSimpleName(output->getFileName())) {};
+       RareDisplay(Calculator* calc, FileOutput* file) : estimate(calc), output(file), nIters(1) {};
        ~RareDisplay()                                  {       delete estimate; delete output;         };
        void init(string);
        void reset();
        void update(SAbundVector*);
-       void update(SharedRAbundVector* shared1, SharedRAbundVector* shared2, int numSeqs, int numGroupComb);
+       void update(vector<SharedRAbundVector*> shared, int numSeqs, int numGroupComb);
        void close();
+       bool isCalcMultiple() { return estimate->getMultiple(); }
+       
+       void outputTempFiles(string);
+       void inputTempFiles(string);
        
 private:
        Calculator* estimate;
        FileOutput* output;
        string label;
+       map<int, vector<double> > results; //maps seqCount to results for that number of sequences
        int nIters;
-       string tempInName, tempOutName;
-       ifstream tempInFile;
-       ofstream tempOutFile;
-       int renameOk;
-
 };
 
 #endif