X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedmorisitahorn.cpp;h=16a759089f079e426d302745e34575f55640f30c;hp=3439747a712822fc316988c3d1aeb637a43cf00e;hb=a8e2df1b96a57f5f29576b08361b86a96a8eff4f;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0

diff --git a/sharedmorisitahorn.cpp b/sharedmorisitahorn.cpp
index 3439747..16a7590 100644
--- a/sharedmorisitahorn.cpp
+++ b/sharedmorisitahorn.cpp
@@ -14,20 +14,20 @@ EstOutput MorHorn::getValues(vector<SharedRAbundVector*> shared) {
 	try {	
 		data.resize(1,0);
 		
-		float Atotal, Btotal, tempA, tempB;
+		double Atotal, Btotal, tempA, tempB;
 		Atotal = 0; Btotal = 0; 
-		float  morhorn, sumSharedA, sumSharedB, a, b, d;
+		double  morhorn, sumSharedA, sumSharedB, a, b, d;
 		morhorn = 0.0; sumSharedA = 0.0; sumSharedB = 0.0; a = 0.0; b = 0.0; d = 0.0;
 		
 		//get the total values we need to calculate the theta denominator sums
-		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
 			Atotal += shared[0]->getAbundance(i);
 			Btotal += shared[1]->getAbundance(i);
 		}
 		
 		//calculate the denominator sums
-		for (int j = 0; j < shared[0]->size(); j++) {
+		for (int j = 0; j < shared[0]->getNumBins(); j++) {
 			//store in temps to avoid multiple repetitive function calls
 			tempA = shared[0]->getAbundance(j);
 			tempB = shared[1]->getAbundance(j);
@@ -39,9 +39,9 @@ EstOutput MorHorn::getValues(vector<SharedRAbundVector*> shared) {
 			d += relA * relB;
 		}
 
-		morhorn = (2 * d) / (a + b);
+		morhorn = 1- (2 * d) / (a + b);
 
-		if (isnan(morhorn) || isinf(morhorn)) { morhorn = 0; }
+		if (isnan(morhorn) || isinf(morhorn)) { morhorn = 1; }
 		
 		data[0] = morhorn;