X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedochiai.cpp;h=b49fa4a3cc5730b0a97b0eefe30f952a7671f932;hp=1d0828ebf5f9b3f46b63bae40504bd041de2735a;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=510b1cfc25cd79391d6973ca20c5ec25fb1bb3b2

diff --git a/sharedochiai.cpp b/sharedochiai.cpp
index 1d0828e..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,7 +40,7 @@ EstOutput Ochiai::getValues(vector<SharedRAbundVector*> shared) {
 		return data;
 	}
 	catch(exception& e) {
-		errorOut(e, "Ochiai", "getValues");
+		m->errorOut(e, "Ochiai", "getValues");
 		exit(1);
 	}
 }