X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedjabund.cpp;h=d86fcb8ef65da974cc69b14be6417939bcded5a7;hp=1c0b6ed37ace1f3042eee85769280168f13d78ce;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=58cf1d08fee8c64334979075fa57bcafb035a2ed

diff --git a/sharedjabund.cpp b/sharedjabund.cpp
index 1c0b6ed..d86fcb8 100644
--- a/sharedjabund.cpp
+++ b/sharedjabund.cpp
@@ -11,29 +11,25 @@
 
 /***********************************************************************/
 
-EstOutput SharedJAbund::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 SharedJAbund 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 SharedJAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}	
 }
 
 /***********************************************************************/