X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothurout.h;h=ac47d79f7d92b113f58dbe421fdbaad892b2b175;hb=fdfbfe59134dd7dd3e49d90609d129128ba2d370;hp=2a6ba2de6316eb24ff281d703f8e27d4c94a45a3;hpb=f55cf350ca6643f8eb070d8336e1957699a3f109;p=mothur.git

diff --git a/mothurout.h b/mothurout.h
index 2a6ba2d..ac47d79 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -68,7 +68,7 @@ class MothurOut {
 		//map<string, string> names;
 		vector<string> binLabelsInFile;
 		vector<string> currentBinLabels;
-		string saveNextLabel, argv, sharedHeaderMode;
+		string saveNextLabel, argv, sharedHeaderMode, groupMode;
 		bool printedHeaders, commandInputsConvertError;
 		
 		//functions from mothur.h
@@ -82,6 +82,7 @@ class MothurOut {
 		int appendFiles(string, string);
 		int renameFile(string, string); //oldname, newname
 		string getFullPathName(string);
+        string findProgramPath(string programName);
 		string hasPath(string);
 		string getExtension(string);
 		string getPathName(string);
@@ -96,8 +97,16 @@ class MothurOut {
 		string getline(istringstream&);
 		void gobble(istream&);
 		void gobble(istringstream&);
-		map<string, int> readNames(string);
+        vector<string> splitWhiteSpace(string& rest, char[], int);
+        vector<string> splitWhiteSpace(string);
+        set<string> readAccnos(string);
+        int readAccnos(string, vector<string>&);
+        map<string, int> readNames(string);
+        int readTax(string, map<string, string>&);
+        int readNames(string, map<string, string>&, map<string, int>&);
 		int readNames(string, map<string, string>&);
+        int readNames(string, map<string, string>&, bool);
+        int readNames(string, map<string, string>&, int);
 		int readNames(string, map<string, vector<string> >&);
 		int readNames(string, vector<seqPriorityNode>&, map<string, string>&);
 		int mothurRemove(string);
@@ -128,7 +137,9 @@ 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&);
+        string makeList(vector<string>&);
 		
 		//math operation
 		int factorial(int num);
@@ -139,9 +150,9 @@ class MothurOut {
 		int getRandomIndex(int); //highest
 
 		int control_pressed;
-		bool executing, runParse, jumble, gui, mothurCalling;
+		bool executing, runParse, jumble, gui, mothurCalling, debug;
 		
-		//current files - if you add a new type you must edit optionParser->getParameters, get.current command and mothurOut->printCurrentFiles/clearCurrentFiles.
+		//current files - if you add a new type you must edit optionParser->getParameters, get.current command and mothurOut->printCurrentFiles/clearCurrentFiles/getCurrentTypes.
 		string getPhylipFile()		{ return phylipfile;		}
 		string getColumnFile()		{ return columnfile;		}
 		string getListFile()		{ return listfile;			}
@@ -162,11 +173,13 @@ class MothurOut {
 		string getAccnosFile()		{ return accnosfile;		}
 		string getTaxonomyFile()	{ return taxonomyfile;		}
 		string getFlowFile()		{ return flowfile;			}
+        string getBiomFile()		{ return biomfile;			}
+        string getCountTableFile()	{ return counttablefile;	}
 		string getProcessors()		{ return processors;		}
 		
 		void setListFile(string f)			{ listfile = getFullPathName(f);			}
 		void setTreeFile(string f)			{ treefile = getFullPathName(f);			}
-		void setGroupFile(string f)			{ groupfile = getFullPathName(f);			}		
+		void setGroupFile(string f)			{ groupfile = getFullPathName(f);	groupMode = "group";		}		
 		void setPhylipFile(string f)		{ phylipfile = getFullPathName(f);			}
 		void setColumnFile(string f)		{ columnfile = getFullPathName(f);			}
 		void setNameFile(string f)			{ namefile = getFullPathName(f);			}	
@@ -184,11 +197,14 @@ class MothurOut {
 		void setAccnosFile(string f)		{ accnosfile = getFullPathName(f);			}
 		void setTaxonomyFile(string f)		{ taxonomyfile = getFullPathName(f);		}
 		void setFlowFile(string f)			{ flowfile = getFullPathName(f);			}
-		void setProcessors(string p)		{ processors = p;							}
+        void setBiomFile(string f)			{ biomfile = getFullPathName(f);			}
+        void setCountTableFile(string f)	{ counttablefile = getFullPathName(f);	groupMode = "count";	}
+        void setProcessors(string p)		{ processors = p; mothurOut("\nUsing " + toString(p) + " processors.\n");	}
 		
 		void printCurrentFiles();
 		bool hasCurrentFiles();
 		void clearCurrentFiles();
+        set<string> getCurrentTypes(); 
 		
 	private:
 		static MothurOut* _uniqueInstance;
@@ -217,11 +233,15 @@ class MothurOut {
 			taxonomyfile = "";
 			processors = "1";
 			flowfile = "";
+            biomfile = "";
+            counttablefile = "";
 			gui = false;
 			printedHeaders = false;
 			commandInputsConvertError = false;
             mothurCalling = false;
+            debug = false;
 			sharedHeaderMode = "";
+            groupMode = "group";
 		}
 		~MothurOut();
 
@@ -229,8 +249,8 @@ class MothurOut {
 		string defaultPath, outputDir;
 		string releaseDate, version;
 	
-		string accnosfile, phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, designfile, taxonomyfile;
-		string orderfile, treefile, sharedfile, ordergroupfile, relabundfile, fastafile, qualfile, sfffile, oligosfile, processors, flowfile;
+		string accnosfile, phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, designfile, taxonomyfile, biomfile;
+		string orderfile, treefile, sharedfile, ordergroupfile, relabundfile, fastafile, qualfile, sfffile, oligosfile, processors, flowfile, counttablefile;
 
 		vector<string> Groups;
 		vector<string> namesOfGroups;