fixes while testing 1.33.0

[mothur.git] / sharedkulczynskicody.cpp

diff --git a/sharedkulczynskicody.cpp b/sharedkulczynskicody.cpp
index 7ae67003cce980fe676f2648887ea4fcea23e554..8c8b7f7f4e181760b5bc9c7adb8117ab535b5c3d 100644 (file)
--- a/sharedkulczynskicody.cpp
+++ b/sharedkulczynskicody.cpp
@@ -13,7 +13,7 @@
 
 EstOutput KulczynskiCody::getValues(vector<SharedRAbundVector*> shared) {
        try {
-               int S1, S2, S12, tempA, tempB;
+               double S1, S2, S12, tempA, tempB;
                S1 = 0; S2 = 0; S12 = 0; tempA = 0; tempB = 0; 
                
                /*S1, S2 = number of OTUs observed or estimated in A and B 
@@ -21,7 +21,7 @@ EstOutput KulczynskiCody::getValues(vector<SharedRAbundVector*> shared) {
 
                data.resize(1,0);
                
-               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
                        tempA = shared[0]->getAbundance(i);
                        tempB = shared[1]->getAbundance(i);
@@ -33,20 +33,16 @@ EstOutput KulczynskiCody::getValues(vector<SharedRAbundVector*> shared) {
                        if ((tempA != 0) && (tempB != 0)) {     S12++; }
                }
                
-               data[0] = 0.5 * ((S12 / (float)S1) + (S12 / (float)S2));
+               data[0] = 1.0 - 0.5 * ((S12 / (float)S1) + (S12 / (float)S2));
                
                if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
                
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the KulczynskiCody class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "KulczynskiCody", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the KulczynskiCody class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/