X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedsorest.cpp;h=b9ab0501bc5f8f7fa000b16b14f79bfad237b8cf;hp=91191d5e9ec85c7b8b1f918148c9a9dfba69fa44;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=e81e076cbba02b37cd338370aaa32acaf1407c29 diff --git a/sharedsorest.cpp b/sharedsorest.cpp index 91191d5..b9ab050 100644 --- a/sharedsorest.cpp +++ b/sharedsorest.cpp @@ -38,7 +38,7 @@ EstOutput SorEst::getValues(vector shared) { S1 = chaoS1->getValues(chaoS1Sabund); S2 = chaoS2->getValues(chaoS2Sabund); - data[0] = (2 * S12[0]) / (float)(S1[0] + S2[0]); + data[0] = 1.0-(2 * S12[0]) / (float)(S1[0] + S2[0]); if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; } @@ -51,13 +51,9 @@ EstOutput SorEst::getValues(vector shared) { return data; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the SorEst class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "SorEst", "getValues"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the SorEst class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } /***********************************************************************/