changed defaults for filter.seqs()

diff --git a/globaldata.cpp b/globaldata.cpp
index e9b3088d12ebdbb62b3e2acf4b309c948c86e079..7d30401785eceee7b6715db556587f2ccdc0c4ed 100644 (file)
--- a/globaldata.cpp
+++ b/globaldata.cpp
@@ -375,7 +375,7 @@ void GlobalData::clear() {
        form                    =       "integral";
        sorted                  =       "T";  //F means don't sort, T means sort.
        vertical        =   "";         
-       trump           =   "";         
+       trump           =   ".";                
        filter          =   "";         
        soft            =   ""; 
        scale                   =       "log10";
@@ -418,6 +418,11 @@ void GlobalData::reset() {
        mismatch                =       "-1.0";
        gapopen                 =       "-1.0";
        gapextend               =       "-2.0";
+       vertical        =   "";         
+       trump           =   ".";                
+       filter          =   "";         
+       soft            =   ""; 
+
 }
 /*******************************************************/
 

diff --git a/venn.cpp b/venn.cpp
index 27dc4acd8a81e9dcab8140cee4dc31129055ae4d..6f44ed3f366fa6eae8a6c72a85d2c1681046e3f5 100644 (file)
--- a/venn.cpp
+++ b/venn.cpp
@@ -238,7 +238,7 @@ 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") {
                                        //merge BC and estimate with shared with A