X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=shannon.cpp;h=b38d7fc272e6e338af026b02db8a80219c06d62d;hb=70491a12902e89b85cfa6b44a7b7fbe066ee2ac1;hp=5045954a425db955349f1dea26ba1da18cf2f2c9;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05;p=mothur.git diff --git a/shannon.cpp b/shannon.cpp index 5045954..b38d7fc 100644 --- a/shannon.cpp +++ b/shannon.cpp @@ -30,7 +30,7 @@ EstOutput Shannon::getValues(SAbundVector* rank){ } shannon = -shannon; - double hvar = (hvara-pow(shannon,2))/(double)sampled+(double)sobs/(double)(2*sampled*sampled); + double hvar = (hvara-pow(shannon,2))/(double)sampled+(double)(sobs-1)/(double)(2*sampled*sampled); double ci = 0; @@ -52,13 +52,9 @@ EstOutput Shannon::getValues(SAbundVector* rank){ return data; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the Shannon class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "Shannon", "getValues"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the Shannon class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } /***********************************************************************/