X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedsorclass.cpp;fp=sharedsorclass.cpp;h=f4757a83ea28a0fff342f4521469a6a43bae44b4;hb=50ed3b6104d5821d6184f882e1e1423d47dcbf10;hp=4fafe3e8d7b5619a1641b4342355b43b499d8a40;hpb=17261b0ad578de8aac463dd6977a2d6fdee565a1;p=mothur.git diff --git a/sharedsorclass.cpp b/sharedsorclass.cpp index 4fafe3e..f4757a8 100644 --- a/sharedsorclass.cpp +++ b/sharedsorclass.cpp @@ -11,7 +11,7 @@ /***********************************************************************/ -EstOutput SorClass::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2) { +EstOutput SorClass::getValues(vector shared) { try { int S1, S2, S12, tempA, tempB; S1 = 0; S2 = 0; S12 = 0; tempA = 0; tempB = 0; @@ -21,10 +21,10 @@ EstOutput SorClass::getValues(SharedRAbundVector* shared1, SharedRAbundVector* s data.resize(1,0); - for (int i = 0; i < shared1->size(); i++) { + for (int i = 0; i < shared[0]->size(); i++) { //store in temps to avoid multiple repetitive function calls - tempA = shared1->getAbundance(i); - tempB = shared2->getAbundance(i); + tempA = shared[0]->getAbundance(i); + tempB = shared[1]->getAbundance(i); //find number of bins in shared1 and shared2 if (tempA != 0) { S1++; }