X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedochiai.cpp;h=b49fa4a3cc5730b0a97b0eefe30f952a7671f932;hp=744fb1c2a4b119561bd4756b98ed39483b2c89d1;hb=050a3ff02473a3d4c0980964e1a9ebe52e55d6b8;hpb=50ed3b6104d5821d6184f882e1e1423d47dcbf10

diff --git a/sharedochiai.cpp b/sharedochiai.cpp
index 744fb1c..b49fa4a 100644
--- a/sharedochiai.cpp
+++ b/sharedochiai.cpp
@@ -13,7 +13,7 @@
 
 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,7 +21,7 @@ EstOutput Ochiai::getValues(vector<SharedRAbundVector*> shared) {
 
 		data.resize(1,0);
 		
-		for (int i = 0; i < shared[0]->size(); i++) {
+		for (int i = 0; i < shared[0]->getNumBins(); i++) {
 			//store in temps to avoid multiple repetitive function calls
 			tempA = shared[0]->getAbundance(i);
 			tempB = shared[1]->getAbundance(i);
@@ -40,13 +40,9 @@ EstOutput Ochiai::getValues(vector<SharedRAbundVector*> shared) {
 		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);
-	}	
 }
 
 /***********************************************************************/