added modify names parameter to set.dir

[mothur.git] / sharedmorisitahorn.cpp

diff --git a/sharedmorisitahorn.cpp b/sharedmorisitahorn.cpp
index d52ead5e6fccbb784487fd188b12424035a30658..16a759089f079e426d302745e34575f55640f30c 100644 (file)
--- a/sharedmorisitahorn.cpp
+++ b/sharedmorisitahorn.cpp
@@ -20,14 +20,14 @@ EstOutput MorHorn::getValues(vector<SharedRAbundVector*> shared) {
                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;