From: westcott <westcott>
Date: Fri, 22 May 2009 19:16:27 +0000 (+0000)
Subject: changed defaults for filter.seqs()
X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=edec660ee2be477ac1539109d949a60cb7e16243

changed defaults for filter.seqs()
---

diff --git a/globaldata.cpp b/globaldata.cpp
index e9b3088..7d30401 100644
--- 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 27dc4ac..6f44ed3 100644
--- 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