X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ace.cpp;h=1fde5118d2bbda9db313c83d5a87a2fec9d3a1ff;hb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;hp=064779467d92c14a514f9ad10c4fd714763401ed;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05;p=mothur.git diff --git a/ace.cpp b/ace.cpp index 0647794..1fde511 100644 --- a/ace.cpp +++ b/ace.cpp @@ -14,7 +14,6 @@ EstOutput Ace::getValues(SAbundVector* rank) { try { data.resize(3,0); - // vector aceData(3,0); double ace, acelci, acehci; int nrare = 0; @@ -43,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; } @@ -141,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); - } } /***********************************************************************/