final commit before testing 1.11

[mothur.git] / ace.cpp

diff --git a/ace.cpp b/ace.cpp
index 17049bdc414f7e4cb0371332b3e2aef7ac2c4f41..1fde5118d2bbda9db313c83d5a87a2fec9d3a1ff 100644 (file)
--- a/ace.cpp
+++ b/ace.cpp
@@ -42,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;                     }
@@ -140,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";
+               m->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);
-       }       
 }
 
 /***********************************************************************/