X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=whittaker.cpp;fp=whittaker.cpp;h=3b179111a854e934b6f9d05e231649796e5565a3;hb=50ed3b6104d5821d6184f882e1e1423d47dcbf10;hp=95f1c9c5fcb789a19a7496a83177ab639d0067e6;hpb=17261b0ad578de8aac463dd6977a2d6fdee565a1;p=mothur.git diff --git a/whittaker.cpp b/whittaker.cpp index 95f1c9c..3b17911 100644 --- a/whittaker.cpp +++ b/whittaker.cpp @@ -11,16 +11,16 @@ /***********************************************************************/ -EstOutput Whittaker::getValues(SharedRAbundVector* shared1, SharedRAbundVector* shared2){ +EstOutput Whittaker::getValues(vector shared){ try{ data.resize(1); int countA = 0; int countB = 0; - int sTotal = shared1->getNumBins(); + int sTotal = shared[0]->getNumBins(); for(int i=0;igetAbundance(i) != 0){ countA++; } - if(shared2->getAbundance(i) != 0){ countB++; } + if(shared[0]->getAbundance(i) != 0){ countA++; } + if(shared[1]->getAbundance(i) != 0){ countB++; } } data[0] = 2*sTotal/(float)(countA+countB)-1;