X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ace.cpp;h=639a48f6e45ac2503bbfbea4d2ba368cfadcd293;hb=96b36196d49a3d1f6bc49a26a9d2aa2da7ff876e;hp=d074310ab1678ca44abbb23372ee74b41321999b;hpb=addc715b6d7ea52440751cec10edad03e1a19b37;p=mothur.git

diff --git a/ace.cpp b/ace.cpp
index d074310..639a48f 100644
--- a/ace.cpp
+++ b/ace.cpp
@@ -13,9 +13,7 @@
 
 EstOutput Ace::getValues(SAbundVector* rank) {
 	try {
-		cout << "abund = " << abund << "\n";
 		data.resize(3,0);
-	//	vector<double> aceData(3,0);
 		double ace, acelci, acehci;
 	
 		int nrare = 0;
@@ -44,7 +42,7 @@ EstOutput Ace::getValues(SAbundVector* rank) {
 	
 		if(denom <= 0.0){	term1=0.0000;	} else {	term1 = (double)(srare * numsum)/(double)denom - 1.0;	}
 		if(term1 >= 0.0){	gamace = term1;	} else {	gamace = 0.0;											}
-
+		
 		if(gamace >= 0.64){
 			gamace = gamace * (1 + (nrare * (1 - Cace) * numsum) / denom);
 			if(gamace<0){			gamace = 0;			}
@@ -142,13 +140,9 @@ EstOutput Ace::getValues(SAbundVector* rank) {
 		return data;
 	}
 	catch(exception& e) {
-		cout << "Standard Error: " << e.what() << " has occurred in the Ace class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		errorOut(e, "Ace", "getValues");
 		exit(1);
 	}
-	catch(...) {
-		cout << "An unknown error has occurred in the Ace class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}	
 }
 
 /***********************************************************************/