X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothurout.h;h=9ce698be4e1963e6af9abee67673ded3e1743fde;hb=7dab6ac3ae5a5f1ce37dca8cfacaa719881fd5b2;hp=0659e4e3628ccb28fdfc024427fe6cebf5af5446;hpb=eb4bb52af987ff4df7354d95d60cd763aec537e1;p=mothur.git

diff --git a/mothurout.h b/mothurout.h
index 0659e4e..9ce698b 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -65,7 +65,7 @@ class MothurOut {
 	
 		vector<string> getAllGroups() { sort(namesOfGroups.begin(), namesOfGroups.end()); return namesOfGroups; }
 		vector<string> Treenames;
-		map<string, string> names;
+		//map<string, string> names;
 		vector<string> binLabelsInFile;
 		vector<string> currentBinLabels;
 		string saveNextLabel, argv, sharedHeaderMode;
@@ -128,6 +128,7 @@ class MothurOut {
 		void splitAtDash(string&, set<string>&);
 		void splitAtDash(string&, vector<string>&);
 		void splitAtChar(string&, vector<string>&, char);
+        void splitAtChar(string&, string&, char);
 		int removeConfidences(string&);
 		
 		//math operation
@@ -162,6 +163,7 @@ class MothurOut {
 		string getAccnosFile()		{ return accnosfile;		}
 		string getTaxonomyFile()	{ return taxonomyfile;		}
 		string getFlowFile()		{ return flowfile;			}
+        string getBiomFile()		{ return biomfile;			}
 		string getProcessors()		{ return processors;		}
 		
 		void setListFile(string f)			{ listfile = getFullPathName(f);			}
@@ -184,6 +186,7 @@ class MothurOut {
 		void setAccnosFile(string f)		{ accnosfile = getFullPathName(f);			}
 		void setTaxonomyFile(string f)		{ taxonomyfile = getFullPathName(f);		}
 		void setFlowFile(string f)			{ flowfile = getFullPathName(f);			}
+        void setBiomFile(string f)			{ biomfile = getFullPathName(f);			}
 		void setProcessors(string p)		{ processors = p;							}
 		
 		void printCurrentFiles();
@@ -217,6 +220,7 @@ class MothurOut {
 			taxonomyfile = "";
 			processors = "1";
 			flowfile = "";
+            biomfile = "";
 			gui = false;
 			printedHeaders = false;
 			commandInputsConvertError = false;
@@ -229,7 +233,7 @@ class MothurOut {
 		string defaultPath, outputDir;
 		string releaseDate, version;
 	
-		string accnosfile, phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, designfile, taxonomyfile;
+		string accnosfile, phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, designfile, taxonomyfile, biomfile;
 		string orderfile, treefile, sharedfile, ordergroupfile, relabundfile, fastafile, qualfile, sfffile, oligosfile, processors, flowfile;
 
 		vector<string> Groups;