changing command name classify.shared to classifyrf.shared

[mothur.git] / solow.cpp

diff --git a/solow.cpp b/solow.cpp
index 3a15fdfd68dea1fe0f91d5ca3fd1e87df10cb745..33f3afbc2336699b07b4ff5ff97200f8e940b530 100644 (file)
--- a/solow.cpp
+++ b/solow.cpp
@@ -3,7 +3,7 @@
  *  Mothur
  *
  *  Created by Thomas Ryabin on 5/13/09.
- *  Copyright 2009 __MyCompanyName__. All rights reserved.
+ *  Copyright 2009Schloss Lab UMASS Amherst. All rights reserved.
  *
  */
 
@@ -17,23 +17,19 @@ EstOutput Solow::getValues(SAbundVector* rank){
        try {
                data.resize(1,0);
                
-               double n = (double)rank->size() - 1;
+               double n = (double)rank->getNumSeqs();
                double f1 = (double)rank->get(1);
                double f2 = (double)rank->get(2);
 
-               data[0] = f1*f1/2/f2 * (1 - pow(1 - 2*f2/n/f1, m));
+               data[0] = f1*f1/2/f2 * (1 - pow(1 - 2*f2/n/f1, f));
                
                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, "Solow", "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);
-       }       
-};
+}
 
 
 /***********************************************************************/