fixes while testing 1.33.0

[mothur.git] / sharedjabund.cpp

diff --git a/sharedjabund.cpp b/sharedjabund.cpp
index 79a57455668b1df99396d17ceb6bf3bcbe0bb2f6..d86fcb8ef65da974cc69b14be6417939bcded5a7 100644 (file)
--- a/sharedjabund.cpp
+++ b/sharedjabund.cpp
@@ -11,29 +11,25 @@
 
 /***********************************************************************/
 
-EstOutput JAbund::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput JAbund::getValues(vector<SharedRAbundVector*> shared) {
        try {
                EstOutput UVest;
                UVest.resize(2,0);
                data.resize(1,0);
                
-               UVest = uv->getUVest(shared1, shared2);
+               UVest = uv->getUVest(shared);
                
                //UVest[0] is Uest UVest[1] is Vest
-               data[0] = (UVest[0] * UVest[1]) / ((float)(UVest[0] + UVest[1] - (UVest[0] * UVest[1])));
-               
+               data[0] = 1.0-(UVest[0] * UVest[1]) / ((float)(UVest[0] + UVest[1] - (UVest[0] * UVest[1])));
+               if(data[0] > 1){data[0] = 0;    }
                if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
                
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the JAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "JAbund", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the JAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/