X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=raredisplay.h;fp=raredisplay.h;h=b7711d2952861086b0efc27e049159073db4ac31;hb=50ed3b6104d5821d6184f882e1e1423d47dcbf10;hp=ff7de73f24146a3b9d8401712c330adabcd8288d;hpb=17261b0ad578de8aac463dd6977a2d6fdee565a1;p=mothur.git diff --git a/raredisplay.h b/raredisplay.h index ff7de73..b7711d2 100644 --- a/raredisplay.h +++ b/raredisplay.h @@ -15,13 +15,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 shared, int numSeqs, int numGroupComb); void close(); + bool isCalcMultiple() { return estimate->getMultiple(); } private: Calculator* estimate;