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

[mothur.git] / sharedbraycurtis.cpp

diff --git a/sharedbraycurtis.cpp b/sharedbraycurtis.cpp
index 299939dbfd156d1e5d9724fb112a4c5e3292c5a1..0182e13bd34ea9164383b5f83c221ae705898677 100644 (file)
--- a/sharedbraycurtis.cpp
+++ b/sharedbraycurtis.cpp
@@ -15,7 +15,7 @@ EstOutput BrayCurtis::getValues(vector<SharedRAbundVector*> shared) {
        try {   
                data.resize(1,0);
                
-               int sumSharedA, sumSharedB, sumSharedAB, tempA, tempB;
+               double sumSharedA, sumSharedB, sumSharedAB, tempA, tempB;
                sumSharedA = 0; sumSharedB = 0; sumSharedAB = 0; 
                
                /*Xi, Yi = abundance of the ith shared OTU in A and B 
@@ -37,14 +37,14 @@ EstOutput BrayCurtis::getValues(vector<SharedRAbundVector*> shared) {
                        else  { sumSharedAB += tempB; }                         
                }
                
-               data[0] = (2 * sumSharedAB) / (float)( sumSharedA + sumSharedB);
+               data[0] = 1.0 - (2 * sumSharedAB) / (float)( sumSharedA + sumSharedB);
                
                if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
                                
                return data;
        }
        catch(exception& e) {
-               errorOut(e, "BrayCurtis", "getValues");
+               m->errorOut(e, "BrayCurtis", "getValues");
                exit(1);
        }
 }