This contains Pat's bug fixes and updates. It represents mothur v.1.3.0

[mothur.git] / efron.cpp

diff --git a/efron.cpp b/efron.cpp
index aeeb4c2f33e79102a77d891abd9961c9e616992e..e88b025d9e3ff2bbd4ffc2ed5db463deb64f9d5f 100644 (file)
--- a/efron.cpp
+++ b/efron.cpp
@@ -17,16 +17,12 @@ EstOutput Efron::getValues(SAbundVector* rank){
                data.resize(1,0);
                
                double n = (double)rank->getNumSeqs();
-               if(m > n) {
-                       cout << "Error in the 'efron' calculator. 'size' must be less than the length of the smallest sabund vector.\n";
-                       data[0] = 0;
-                       return data;
-               }
+               if(m > n || m == 0) {   m = n;  }
                
                double sum = 0;
-               for(int i = 1; i < rank->size(); i++)
-                       sum += pow(-1, (double)(i+1)) * pow(((double)m / n), i) * (double)(rank->get(i));
-
+               for(int i = 1; i < rank->size(); i++){
+                       sum += pow(-1., i+1) * pow(((double)m / n), i) * (double)(rank->get(i));
+               }
                data[0] = sum;
                
                return data;