added concensus command and updated calcs

[mothur.git] / sharedjest.cpp

diff --git a/sharedjest.cpp b/sharedjest.cpp
index 079cdef11de26892e35942c329a2f8e974131eed..3e370463aba858c2c3a824f4c38e055b800b1fd7 100644 (file)
--- a/sharedjest.cpp
+++ b/sharedjest.cpp
@@ -14,7 +14,7 @@
 
 /***********************************************************************/
 
-EstOutput Jest::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) {
+EstOutput Jest::getValues(vector<SharedRAbundVector*> shared) {
        try {
                EstOutput S1, S2, S12;
                S12.resize(1,0);
@@ -32,10 +32,10 @@ EstOutput Jest::getValues(SharedRAbundVector* shared1, SharedRAbundVector* share
                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);