X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedochiai.cpp;h=b49fa4a3cc5730b0a97b0eefe30f952a7671f932;hb=541bab1dac00688b4c3a8c4a95ab464412663c50;hp=a9677e5b6731d0c93c50692d106e5bfb36bc6fff;hpb=c537597ec5ebd47b4898da87ae03b0c2aeced354;p=mothur.git

diff --git a/sharedochiai.cpp b/sharedochiai.cpp
index a9677e5..b49fa4a 100644
--- a/sharedochiai.cpp
+++ b/sharedochiai.cpp
@@ -11,9 +11,9 @@
 
 /***********************************************************************/
 
-EstOutput Ochiai::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput Ochiai::getValues(vector<SharedRAbundVector*> shared) {
 	try {
-		int S1, S2, S12, tempA, tempB;
+		double S1, S2, S12, tempA, tempB;
 		S1 = 0; S2 = 0; S12 = 0; tempA = 0; tempB = 0; 
 		
 		/*S1, S2 = number of OTUs observed or estimated in A and B 
@@ -21,10 +21,10 @@ EstOutput Ochiai::getValues(SharedRAbundVector* shared1, SharedRAbundVector* sha
 
 		data.resize(1,0);
 		
-		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);
 			
 			if (tempA != 0) { S1++; }
 			if (tempB != 0) { S2++; } 
@@ -40,13 +40,9 @@ EstOutput Ochiai::getValues(SharedRAbundVector* shared1, SharedRAbundVector* sha
 		return data;
 	}
 	catch(exception& e) {
-		cout << "Standard Error: " << e.what() << " has occurred in the Ochiai class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		m->errorOut(e, "Ochiai", "getValues");
 		exit(1);
 	}
-	catch(...) {
-		cout << "An unknown error has occurred in the Ochiai class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}	
 }
 
 /***********************************************************************/