fixed Thomas' calculators

[mothur.git] / sharedjabund.cpp

diff --git a/sharedjabund.cpp b/sharedjabund.cpp
index 1c0b6ed37ace1f3042eee85769280168f13d78ce..b969e24f4286e794894b04c9897f49a593f67317 100644 (file)
--- a/sharedjabund.cpp
+++ b/sharedjabund.cpp
@@ -11,13 +11,13 @@
 
 /***********************************************************************/
 
-EstOutput SharedJAbund::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput JAbund::getValues(vector<SharedRAbundVector*> shared) {
        try {
                EstOutput UVest;
                UVest.resize(2,0);
                data.resize(1,0);
                
-               UVest = uv->getUVest(shared1, shared2);
+               UVest = uv->getUVest(shared);
                
                //UVest[0] is Uest UVest[1] is Vest
                data[0] = (UVest[0] * UVest[1]) / ((float)(UVest[0] + UVest[1] - (UVest[0] * UVest[1])));
@@ -27,11 +27,11 @@ EstOutput SharedJAbund::getValues(SharedRAbundVector* shared1, SharedRAbundVecto
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the SharedJAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               cout << "Standard Error: " << e.what() << " has occurred in the JAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
        }
        catch(...) {
-               cout << "An unknown error has occurred in the SharedJAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               cout << "An unknown error has occurred in the JAbund class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
        }       
 }