pat's mods to morisitahorn and pre.cluster

[mothur.git] / bergerparker.cpp

diff --git a/bergerparker.cpp b/bergerparker.cpp
index 893f2a95dad68e6f9ba1638eb29be43071a711aa..a1e4b060ccf961dc7aa6bd075173f1b91d4776ac 100644 (file)
--- a/bergerparker.cpp
+++ b/bergerparker.cpp
@@ -15,8 +15,7 @@ EstOutput BergerParker::getValues(SAbundVector* rank){
        try {
                data.resize(1,0);
                //Berger-Parker index
-               double BP = (double)rank->getNumSeqs()/(double)rank->getMaxRank();
-               //cout << "BP index = " << 1/BP << "\n\n";
+               double BP = (double)rank->getMaxRank() / (double)rank->getNumSeqs();
                
                data[0] = BP;
                if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }
@@ -24,13 +23,9 @@ EstOutput BergerParker::getValues(SAbundVector* rank){
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the NPShannon class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "BergerParker", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the NPShannon class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/