changes while testing

[mothur.git] / sharedkulczynski.cpp

diff --git a/sharedkulczynski.cpp b/sharedkulczynski.cpp
index 5eadd16691e770453f0ed0053aa3a42ffa3e7b73..5c91ddb65c654c5788c748596e87ddda94ae25f1 100644 (file)
--- a/sharedkulczynski.cpp
+++ b/sharedkulczynski.cpp
@@ -2,7 +2,7 @@
  *  sharedkulczynski.cpp
  *  Mothur
  *
- *  Created by John Westcott on 3/24/09.
+ *  Created by Sarah Westcott on 3/24/09.
  *  Copyright 2009 Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
@@ -13,7 +13,7 @@
 
 EstOutput Kulczynski::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 Kulczynski::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 Kulczynski::getValues(vector<SharedRAbundVector*> shared) {
                        if ((tempA != 0) && (tempB != 0)) {     S12++; }
                }
                
-               data[0] = S12 / (float)(S1 + S2 - (2 * S12));
+               data[0] = 1.0 - S12 / (float)(S1 + S2 - (2 * S12));
                
                if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
                
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the Kulczynski class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "Kulczynski", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the Kulczynski class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/