added concensus command and updated calcs

[mothur.git] / sharedjabund.cpp

diff --git a/sharedjabund.cpp b/sharedjabund.cpp
index 79a57455668b1df99396d17ceb6bf3bcbe0bb2f6..b969e24f4286e794894b04c9897f49a593f67317 100644 (file)
--- a/sharedjabund.cpp
+++ b/sharedjabund.cpp
@@ -11,13 +11,13 @@
 
 /***********************************************************************/
 
-EstOutput JAbund::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])));