changing command name classify.shared to classifyrf.shared

[mothur.git] / sharedjest.cpp

diff --git a/sharedjest.cpp b/sharedjest.cpp
index 1ca64b438036d40e2e75e70cde735f8637a53c6b..9a1cfbb5a1567153628a1213a494c36242e1d763 100644 (file)
--- a/sharedjest.cpp
+++ b/sharedjest.cpp
@@ -38,8 +38,8 @@ EstOutput Jest::getValues(vector<SharedRAbundVector*> 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<SharedRAbundVector*> 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);
-       }       
 }
 
 /***********************************************************************/