pat's changes after generating wiki pages for 1.5

[mothur.git] / raredisplay.h

diff --git a/raredisplay.h b/raredisplay.h
index ad6a389c7cf980ee2e1b2912ab8716ccd8a420c7..c9067060820eece4446921011634c1515c44b812 100644 (file)
--- a/raredisplay.h
+++ b/raredisplay.h
@@ -5,9 +5,6 @@
 #include "calculator.h"
 #include "fileoutput.h"
 #include "display.h"
-#include <vector>
-
-using namespace std;
 
 /***********************************************************************/
 
@@ -15,13 +12,14 @@ 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())) {};
+                                                       tempInName(getPathName(output->getFileName()) + ".tempin"), tempOutName(getPathName(output->getFileName()) + ".tempout") {};
        ~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(); }
        
 private:
        Calculator* estimate;
@@ -31,6 +29,7 @@ private:
        string tempInName, tempOutName;
        ifstream tempInFile;
        ofstream tempOutFile;
+       int renameOk;
 
 };