changes while testing

[mothur.git] / sharedsorest.cpp

diff --git a/sharedsorest.cpp b/sharedsorest.cpp
index 429308fc1e457fd469fd1b0eb005b356496a7880..b9ab0501bc5f8f7fa000b16b14f79bfad237b8cf 100644 (file)
--- a/sharedsorest.cpp
+++ b/sharedsorest.cpp
@@ -38,20 +38,22 @@ EstOutput SorEst::getValues(vector<SharedRAbundVector*> shared) {
                S1 = chaoS1->getValues(chaoS1Sabund);
                S2 = chaoS2->getValues(chaoS2Sabund);
                
-               data[0] = (2 * S12[0]) / (float)(S1[0] + S2[0]);
+               data[0] = 1.0-(2 * S12[0]) / (float)(S1[0] + S2[0]);
                 
                if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
                
+               delete sharedChao;
+               delete chaoS1;
+               delete chaoS2;
+               delete chaoS1Sabund;
+               delete chaoS2Sabund;
+               
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the SorEst class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "SorEst", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the SorEst class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/