changed defaults for filter.seqs()

[mothur.git] / sharedsorest.cpp

diff --git a/sharedsorest.cpp b/sharedsorest.cpp
index 4f44b910dfc3a8c61e8c3e9daff78df2322e371b..91191d5e9ec85c7b8b1f918148c9a9dfba69fa44 100644 (file)
--- a/sharedsorest.cpp
+++ b/sharedsorest.cpp
@@ -13,7 +13,7 @@
 
 /***********************************************************************/
 
-EstOutput SharedSorEst::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput SorEst::getValues(vector<SharedRAbundVector*> shared) {
        try {
                EstOutput S1, S2, S12;
                S12.resize(1,0);
@@ -31,10 +31,10 @@ EstOutput SharedSorEst::getValues(SharedRAbundVector* shared1, SharedRAbundVecto
                SAbundVector* chaoS1Sabund = new SAbundVector();
                SAbundVector* chaoS2Sabund = new SAbundVector();
                
-               *chaoS1Sabund = shared1->getSAbundVector();
-               *chaoS2Sabund = shared2->getSAbundVector();
+               *chaoS1Sabund = shared[0]->getSAbundVector();
+               *chaoS2Sabund = shared[1]->getSAbundVector();
                
-               S12 = sharedChao->getValues(shared1, shared2);
+               S12 = sharedChao->getValues(shared);
                S1 = chaoS1->getValues(chaoS1Sabund);
                S2 = chaoS2->getValues(chaoS2Sabund);
                
@@ -42,14 +42,20 @@ EstOutput SharedSorEst::getValues(SharedRAbundVector* shared1, SharedRAbundVecto
                 
                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 SharedSorEst class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               cout << "Standard Error: " << e.what() << " has occurred in the SorEst class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
        }
        catch(...) {
-               cout << "An unknown error has occurred in the SharedSorEst class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               cout << "An unknown error has occurred in the SorEst class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
        }       
 }