X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=venn.cpp;h=112a78b22a18850934f297d2cf63d60e86697c30;hb=e7fe6dd9db877b98c362f9524c3130bbbd037200;hp=27dc4acd8a81e9dcab8140cee4dc31129055ae4d;hpb=6f9dc7ca71d7b8ed4aba2824f76ae6b29da89f3b;p=mothur.git diff --git a/venn.cpp b/venn.cpp index 27dc4ac..112a78b 100644 --- a/venn.cpp +++ b/venn.cpp @@ -238,9 +238,9 @@ void Venn::getPic(vector lookup, vector vCalcs vector sharedCwithAB; //find possible sharedABC values - float sharedABC1, sharedABC2, sharedABC3, sharedABC; + float sharedABC1 = 0.0; float sharedABC2 = 0.0; float sharedABC3 = 0.0; float sharedABC = 0.0; - if (vCalcs[i]->getName() != "sharedchao") { + if (vCalcs[i]->getMultiple() == false) { //merge BC and estimate with shared with A SharedRAbundVector* merge = new SharedRAbundVector(); for (int j = 0; j < lookup[1]->size(); j++) { @@ -342,6 +342,7 @@ void Venn::getPic(vector lookup, vector vCalcs }else { outsvg << "\n"; } outsvg << "The total richness of all the groups is " + toString(numA[0] + numB[0] + numC[0] - sharedAB[0] - sharedAC[0] - sharedBC[0] + sharedABC) + "\n"; + outsvg << "The total shared richness is " + toString(sharedABC) + "\n"; //close file outsvg << "\n\n";