more calculator edits and added coverage and whittaker

[mothur.git] / geom.cpp

diff --git a/geom.cpp b/geom.cpp
index 31580db15b7bbb08b648cd10ff3c0bcf4cd98a10..755c1ec81cd282224ad44f574ec13627a9fd1408 100644 (file)
--- a/geom.cpp
+++ b/geom.cpp
@@ -75,26 +75,18 @@ EstOutput Geom::getValues(SAbundVector* rank){
                        
                }
 
-               double DStatistic = maxDiff/numInd;
-               double critVal = 0;
+
                /*cout << "Geom:\n";
                cout << "D-Statistic = " << DStatistic << "\n";
                cout << "Critical value for 95% confidence interval = ";*/
-               if(rdata.size() > 20)
-               {
-                       data[1] = 1.031/sqrt(rdata.size());
-                       data[2] = 0.886/sqrt(rdata.size());
-               }
-               else
-               {
-                       KOSTable table;
-                       critVal = table.getConfLimit(numSpec);
-               }
+
+               data[0] = maxDiff/numInd;
+               data[1] = 0.886/sqrt(numSpec);
+               data[2] = 1.031/sqrt(numSpec);
+
                /*cout << critVal << "\n";
                cout << "If D-Statistic is less than the critical value then the data fits the Geometric Series model w/ 95% confidence.\n\n";*/
-               
-               data[0] = DStatistic;
-               
+                               
                if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
                if (isnan(data[1]) || isinf(data[1])) { data[1] = 0; }
                if (isnan(data[2]) || isinf(data[2])) { data[2] = 0; }