X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=shen.cpp;h=dac12bd69e83fb635c5b1ab1433a776940332e8e;hp=612a253dfd56ec074ab7bc305c1bf45f5b47e3c5;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=0470f6d037aacb3563c3f7010708120a4a67d4e6

diff --git a/shen.cpp b/shen.cpp
index 612a253..dac12bd 100644
--- a/shen.cpp
+++ b/shen.cpp
@@ -15,7 +15,6 @@
 EstOutput Shen::getValues(SAbundVector* rank){
 
 	try {
-		globaldata = GlobalData::getInstance();
 		
 		data.resize(1,0);
 		
@@ -27,19 +26,17 @@ EstOutput Shen::getValues(SAbundVector* rank){
 		
 		double f0 = ace[0]-rank->getNumBins();
 		
-		data[0] = f0 * (1 - pow(1 - f1/n/f0, m));
-
+		data[0] = f0 * (1 - pow(1 - f1/n/f0, f));
+		
+		delete calc;
+		
 		return data;
 	}
 	catch(exception& e) {
-		cout << "Standard Error: " << e.what() << " has occurred in the Coverage class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		m->errorOut(e, "Shen", "getValues");
 		exit(1);
 	}
-	catch(...) {
-		cout << "An unknown error has occurred in the Coverage class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}	
-};
+}
 
 
 /***********************************************************************/