X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=raredisplay.h;h=c9067060820eece4446921011634c1515c44b812;hb=c53c53b0280452e1c3a087fbf807b2e508cd66c4;hp=ff7de73f24146a3b9d8401712c330adabcd8288d;hpb=c5c7502f435e1413c19e373dab1dfebcaa67588d;p=mothur.git

diff --git a/raredisplay.h b/raredisplay.h
index ff7de73..c906706 100644
--- a/raredisplay.h
+++ b/raredisplay.h
@@ -6,22 +6,20 @@
 #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())) {};
+							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;