added concensus command and updated calcs

[mothur.git] / sharedsorest.cpp

diff --git a/sharedsorest.cpp b/sharedsorest.cpp
index 68048b10dc5f5f53cbddbbd42873ed01b5edeaaf..429308fc1e457fd469fd1b0eb005b356496a7880 100644 (file)
--- a/sharedsorest.cpp
+++ b/sharedsorest.cpp
@@ -13,7 +13,7 @@
 
 /***********************************************************************/
 
-EstOutput SorEst::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput SorEst::getValues(vector<SharedRAbundVector*> shared) {
        try {
                EstOutput S1, S2, S12;
                S12.resize(1,0);
@@ -31,10 +31,10 @@ EstOutput SorEst::getValues(SharedRAbundVector* shared1, SharedRAbundVector* sha
                SAbundVector* chaoS1Sabund = new SAbundVector();
                SAbundVector* chaoS2Sabund = new SAbundVector();
                
-               *chaoS1Sabund = shared1->getSAbundVector();
-               *chaoS2Sabund = shared2->getSAbundVector();
+               *chaoS1Sabund = shared[0]->getSAbundVector();
+               *chaoS2Sabund = shared[1]->getSAbundVector();
                
-               S12 = sharedChao->getValues(shared1, shared2);
+               S12 = sharedChao->getValues(shared);
                S1 = chaoS1->getValues(chaoS1Sabund);
                S2 = chaoS2->getValues(chaoS2Sabund);