X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothurout.h;h=cc8bfb6b101b13b0ebe45a2eb2f5472600d6e0fc;hb=e0ce7cbc93d7d2fbb753ca694182db092a0ea0e7;hp=013aa541444227deab43ec80eda7948dfd402bb6;hpb=ae57e166b2ed7b475ec3f466106bd76fabadd063;p=mothur.git

diff --git a/mothurout.h b/mothurout.h
index 013aa54..cc8bfb6 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -12,6 +12,22 @@
 
 #include "mothur.h"
 
+/***********************************************/
+struct logger {
+    
+    logger() {}
+    ~logger() {}
+    
+    template< class T >
+    logger& operator <<( const T& o ) {
+        cout << o; return *this;
+    }
+    
+    logger& operator<<(ostream& (*m)(ostream&) ) {
+        cout << m; return *this;
+    }
+    
+}; 
 /***********************************************/
 
 class MothurOut {
@@ -49,22 +65,24 @@ 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;
-		bool printedHeaders;
+		bool printedHeaders, commandInputsConvertError;
 		
 		//functions from mothur.h
 		//file operations
+        bool dirCheck(string&); //completes path, appends appropriate / or \, makes sure dir is writable.
 		vector<unsigned long long> divideFile(string, int&);
 		int divideFile(string, int&, vector<string>&);
 		vector<unsigned long long> setFilePosEachLine(string, int&);
 		vector<unsigned long long> setFilePosFasta(string, int&);
 		string sortFile(string, string);
-		void appendFiles(string, string);
+		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);
@@ -81,8 +99,13 @@ class MothurOut {
 		void gobble(istringstream&);
 		map<string, int> readNames(string);
 		int readNames(string, map<string, string>&);
+		int readNames(string, map<string, vector<string> >&);
 		int readNames(string, vector<seqPriorityNode>&, map<string, string>&);
-		void mothurRemove(string);
+		int mothurRemove(string);
+		bool mothurConvert(string, int&); //use for converting user inputs. Sets commandInputsConvertError to true if error occurs. Engines check this.
+		bool mothurConvert(string, float&); //use for converting user inputs. Sets commandInputsConvertError to true if error occurs. Engines check this.
+		bool mothurConvert(string, double&); //use for converting user inputs. Sets commandInputsConvertError to true if error occurs. Engines check this.
+	
 		
 		//searchs and checks
 		bool checkReleaseVersion(ifstream&, string);
@@ -92,8 +115,10 @@ class MothurOut {
 		void getNumSeqs(ifstream&, int&);
 		int getNumSeqs(ifstream&);
 		int getNumNames(string);
+		int getNumChar(string, char);
 		bool isTrue(string);
 		bool isContainingOnlyDigits(string);
+		bool isNumeric1(string);
 	
 		
 		//string manipulation
@@ -104,6 +129,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);
@@ -114,7 +142,7 @@ class MothurOut {
 		int getRandomIndex(int); //highest
 
 		int control_pressed;
-		bool executing, runParse, jumble, gui;
+		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.
 		string getPhylipFile()		{ return phylipfile;		}
@@ -137,6 +165,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);			}
@@ -159,6 +188,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();
@@ -192,8 +222,12 @@ class MothurOut {
 			taxonomyfile = "";
 			processors = "1";
 			flowfile = "";
+            biomfile = "";
 			gui = false;
 			printedHeaders = false;
+			commandInputsConvertError = false;
+            mothurCalling = false;
+            debug = false;
 			sharedHeaderMode = "";
 		}
 		~MothurOut();
@@ -202,7 +236,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;