dist.seqs can now use n processors, and only outputs the phylip formatted distance...

[mothur.git] / venn.cpp

diff --git a/venn.cpp b/venn.cpp
index 27dc4acd8a81e9dcab8140cee4dc31129055ae4d..112a78b22a18850934f297d2cf63d60e86697c30 100644 (file)
--- a/venn.cpp
+++ b/venn.cpp
@@ -238,9 +238,9 @@ void Venn::getPic(vector<SharedRAbundVector*> lookup, vector<Calculator*> vCalcs
                                vector<double> 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<SharedRAbundVector*> lookup, vector<Calculator*> vCalcs
                                }else { outsvg << "</text>\n"; }
 
                                outsvg << "<text fill=\"black\" class=\"seri\" x=\"175\" y=\"640\">The total richness of all the groups is " + toString(numA[0] + numB[0] + numC[0] - sharedAB[0] - sharedAC[0] - sharedBC[0] + sharedABC) + "</text>\n";
+                               outsvg << "<text fill=\"black\" class=\"seri\" x=\"175\" y=\"780\">The total shared richness is " + toString(sharedABC) + "</text>\n";
                                
                                //close file
                                outsvg << "</g>\n</svg>\n";