changes while testing

[mothur.git] / shen.cpp

diff --git a/shen.cpp b/shen.cpp
index 152a138c279a101038566ced46339d970caef9bd..dac12bd69e83fb635c5b1ab1433a776940332e8e 100644 (file)
--- a/shen.cpp
+++ b/shen.cpp
@@ -26,19 +26,17 @@ EstOutput Shen::getValues(SAbundVector* rank){
                
                double f0 = ace[0]-rank->getNumBins();
                
-               data[0] = f0 * (1 - pow(1 - f1/n/f0, m));
-
+               data[0] = f0 * (1 - pow(1 - f1/n/f0, f));
+               
+               delete calc;
+               
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the Coverage class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "Shen", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the Coverage class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
-};
+}
 
 
 /***********************************************************************/