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