X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=rarecalc.h;h=8a0fb72b5ef946a14f343704f6e7c2b608305e3b;hp=1079b96708bf8a5fc2f17e54828a22f270493601;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05

diff --git a/rarecalc.h b/rarecalc.h
index 1079b96..8a0fb72 100644
--- a/rarecalc.h
+++ b/rarecalc.h
@@ -11,21 +11,20 @@
 
 /* This class is not currently used by Mothur */
 
-
-#include <Carbon/Carbon.h>
 #include "calculator.h"
 
 /***********************************************************************/
 class RareCalc {
 
 public:
-	RareCalc(RAbundVector* b) : bins(b), numSeqs(b->getNumSeqs()), maxRank(b->getMaxRank()), numBins(b->getNumBins()) {	bMatrix = binomial(numSeqs+1);	};
+	RareCalc(RAbundVector* b) : bins(b), numSeqs(b->getNumSeqs()), maxRank(b->getMaxRank()), numBins(b->getNumBins()) {	m = MothurOut::getInstance(); bMatrix = m->binomial(numSeqs+1); }
 	EstOutput getValues(int);
-	string getName()	{	return "RareCalc";	}
+	string getName()	{	return "rarecalc";	}
 private:
 	RAbundVector* bins;
 	vector<vector<double> > bMatrix;
 	int numSeqs, maxRank, numBins;
+	MothurOut* m;
 };
 
 /***********************************************************************/