X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedthetan.cpp;h=644adee677820f92a7c8cf87c41d65908a1e957b;hp=361c7b26ebc52937a6fcd2f890da162a4a3cd9b3;hb=a8e2df1b96a57f5f29576b08361b86a96a8eff4f;hpb=e4c80376cc4533f66c8dfc18f3e1a86a60ac17fe diff --git a/sharedthetan.cpp b/sharedthetan.cpp index 361c7b2..644adee 100644 --- a/sharedthetan.cpp +++ b/sharedthetan.cpp @@ -20,14 +20,14 @@ EstOutput ThetaN::getValues(vector shared) { numerator = 0.0; denominator = 0.0; thetaN = 0.0; sumSharedA = 0.0; sumSharedB = 0.0; a = 0.0; b = 0.0; d = 0.0; //get the total values we need to calculate the theta denominator sums - for (int i = 0; i < shared[0]->size(); i++) { + for (int i = 0; i < shared[0]->getNumBins(); i++) { //store in temps to avoid multiple repetitive function calls Atotal += shared[0]->getAbundance(i); Btotal += shared[1]->getAbundance(i); } //calculate the theta denominator sums - for (int j = 0; j < shared[0]->size(); j++) { + for (int j = 0; j < shared[0]->getNumBins(); j++) { //store in temps to avoid multiple repetitive function calls tempA = shared[0]->getAbundance(j); tempB = shared[1]->getAbundance(j); @@ -46,7 +46,7 @@ EstOutput ThetaN::getValues(vector shared) { if (isnan(thetaN) || isinf(thetaN)) { thetaN = 0; } - data[0] = thetaN; + data[0] = 1.0 - thetaN; return data; }