added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / sharedmorisitahorn.cpp

diff --git a/sharedmorisitahorn.cpp b/sharedmorisitahorn.cpp
index d5cdeeccd05dbe8570ad09c5617c3ef106a7be78..bd4923f32ddf4337ce6f8570fd57fcd199ccaf6f 100644 (file)
--- a/sharedmorisitahorn.cpp
+++ b/sharedmorisitahorn.cpp
@@ -14,9 +14,9 @@ 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
@@ -39,16 +39,16 @@ 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;
                
                return data;
        }
        catch(exception& e) {
-               errorOut(e, "MorHorn", "getValues");
+               m->errorOut(e, "MorHorn", "getValues");
                exit(1);
        }
 }