pat's mods to morisitahorn and pre.cluster

[mothur.git] / sharedmorisitahorn.cpp

diff --git a/sharedmorisitahorn.cpp b/sharedmorisitahorn.cpp
index f9c1b6be1035ef85e6ea0e2c25be118cd99b9c97..d5cdeeccd05dbe8570ad09c5617c3ef106a7be78 100644 (file)
--- a/sharedmorisitahorn.cpp
+++ b/sharedmorisitahorn.cpp
@@ -14,7 +14,7 @@ EstOutput MorHorn::getValues(vector<SharedRAbundVector*> shared) {
        try {   
                data.resize(1,0);
                
-               int Atotal, Btotal, tempA, tempB;
+               float Atotal, Btotal, tempA, tempB;
                Atotal = 0; Btotal = 0; 
                float  morhorn, sumSharedA, sumSharedB, a, b, d;
                morhorn = 0.0; sumSharedA = 0.0; sumSharedB = 0.0; a = 0.0; b = 0.0; d = 0.0;
@@ -26,23 +26,21 @@ EstOutput MorHorn::getValues(vector<SharedRAbundVector*> shared) {
                        Btotal += shared[1]->getAbundance(i);
                }
                
-               //calculate the theta denominator sums
+               //calculate the denominator sums
                for (int j = 0; j < shared[0]->size(); j++) {
                        //store in temps to avoid multiple repetitive function calls
                        tempA = shared[0]->getAbundance(j);
                        tempB = shared[1]->getAbundance(j);
+                       float relA = tempA / Atotal;
+                       float relB = tempB / Btotal;
                        
-                       a += tempA * tempA;
-                       b += tempB * tempB;
-                       d += tempA * tempB;
+                       a += relA * relA;
+                       b += relB * relB;
+                       d += relA * relB;
                }
 
-               a /= double(Atotal * Atotal);
-               b /= double(Btotal * Btotal);
-               d /= double(Atotal * Btotal);
-               
                morhorn = (2 * d) / (a + b);
-               
+
                if (isnan(morhorn) || isinf(morhorn)) { morhorn = 0; }
                
                data[0] = morhorn;