X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=raredisplay.h;h=a87596225b818c525fdd97156f5baf64b1dceb71;hb=70491a12902e89b85cfa6b44a7b7fbe066ee2ac1;hp=50e212168893a17cd3f017d2081d3c9e3a43b925;hpb=bfbc55964f1977da72c2cea984288a427d370a59;p=mothur.git

diff --git a/raredisplay.h b/raredisplay.h
index 50e2121..a875962 100644
--- a/raredisplay.h
+++ b/raredisplay.h
@@ -6,32 +6,31 @@
 #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), index(0) {};
 	~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;
-	int nIters;
-	string tempInName, tempOutName;
-	ifstream tempInFile;
-	ofstream tempOutFile;
-
+	vector<int> seqs;  
+	vector<double> results;
+	vector<double> var;
+	int index, nIters;
 };
 
 #endif