]> git.donarmstrong.com Git - mothur.git/blobdiff - sharedsorabund.cpp
changed random forest output filename
[mothur.git] / sharedsorabund.cpp
index e8953819decf34c6f90efec99da646a7ca38af33..9a1bd63d7bd2a5b459c6b9955afa77cebc23ed7c 100644 (file)
 
 /***********************************************************************/
 
-EstOutput SharedSorAbund::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput SorAbund::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] = (2 * UVest[0] * UVest[1]) / ((float)(UVest[0] + UVest[1]));
                
                if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
+               data[0] = 1-data[0];
                
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the SharedSorAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "SorAbund", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the SharedSorAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/