X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedsorabund.cpp;h=9a1bd63d7bd2a5b459c6b9955afa77cebc23ed7c;hp=36478deab9f91812d44b4a214ea7ff64d037e513;hb=050a3ff02473a3d4c0980964e1a9ebe52e55d6b8;hpb=c537597ec5ebd47b4898da87ae03b0c2aeced354

diff --git a/sharedsorabund.cpp b/sharedsorabund.cpp
index 36478de..9a1bd63 100644
--- a/sharedsorabund.cpp
+++ b/sharedsorabund.cpp
@@ -11,29 +11,26 @@
 
 /***********************************************************************/
 
-EstOutput SorAbund::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 SorAbund 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 SorAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}	
 }
 
 /***********************************************************************/