X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=uvest.cpp;h=f0ca81e99748534f3eff5b28d401e04ec8b116b6;hp=725bcd1513e13b26f49d8d226aef1b09bc739569;hb=a8e2df1b96a57f5f29576b08361b86a96a8eff4f;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05

diff --git a/uvest.cpp b/uvest.cpp
index 725bcd1..f0ca81e 100644
--- a/uvest.cpp
+++ b/uvest.cpp
@@ -11,7 +11,7 @@
 
 /***********************************************************************/
 //This is used by SharedJAbund and SharedSorAbund
-EstOutput UVEst::getUVest(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput UVEst::getUVest(vector<SharedRAbundVector*> shared) {
 	try {	
 		EstOutput results;
 		results.resize(2,0);
@@ -29,10 +29,10 @@ EstOutput UVEst::getUVest(SharedRAbundVector* shared1, SharedRAbundVector* share
 		sumSharedA1 = the sum of all shared otus in A where B = 1
 		sumSharedB1 = the sum of all shared otus in B where A = 1 */
 		
-		for (int i = 0; i < shared1->size(); i++) {
+		for (int i = 0; i < shared[0]->getNumBins(); i++) {
 			//store in temps to avoid multiple repetitive function calls
-			tempA = shared1->getAbundance(i);
-			tempB = shared2->getAbundance(i);
+			tempA = shared[0]->getAbundance(i);
+			tempB = shared[1]->getAbundance(i);
 
 			Atotal += tempA;
 			Btotal += tempB;
@@ -80,15 +80,9 @@ EstOutput UVEst::getUVest(SharedRAbundVector* shared1, SharedRAbundVector* share
 		return results;
 	}
 	catch(exception& e) {
-		cout << "Standard Error: " << e.what() << " has occurred in the UVEst class Function getUVest. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		m->errorOut(e, "UVEst", "getUVest");
 		exit(1);
 	}
-	catch(...) {
-		cout << "An unknown error has occurred in the UVEst class Function getUVest. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}	
-
-
 }
 
 /***********************************************************************/