broke up globaldata and moved error checking and help into commands

[mothur.git] / shen.cpp

diff --git a/shen.cpp b/shen.cpp
index 61291a62554a3ccfb0a1b35bd761fb5bfcf1e881..612a253dfd56ec074ab7bc305c1bf45f5b47e3c5 100644 (file)
--- a/shen.cpp
+++ b/shen.cpp
@@ -22,13 +22,10 @@ EstOutput Shen::getValues(SAbundVector* rank){
                double n = (double)rank->getNumSeqs();
                double f1 = (double)rank->get(1);
                
-               int abund;
-               convert(globaldata->getAbund(), abund);
-               
                Ace* calc = new Ace(abund);
                EstOutput ace = calc->getValues(rank);
                
-               double f0 = n - ace[0];
+               double f0 = ace[0]-rank->getNumBins();
                
                data[0] = f0 * (1 - pow(1 - f1/n/f0, m));