X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=mothurout.h;h=f99eac1917cbe2ce5a1ce278c66d27d1df71737e;hp=ffdcaf63d704d087eccf27892bf6797765955a0e;hb=bd27c2b0612942815b7417c79f7ee41f669a2a34;hpb=4b54ce99af7db8019ea907cd7c2edf789369ada9

diff --git a/mothurout.h b/mothurout.h
index ffdcaf6..f99eac1 100644
--- a/mothurout.h
+++ b/mothurout.h
@@ -40,6 +40,7 @@ class MothurOut {
 		void mothurOutEndLine(); //writes to cout and the logfile
 		void mothurOut(string, ofstream&); //writes to the ofstream, cout and the logfile
 		void mothurOutEndLine(ofstream&); //writes to the ofstream, cout and the logfile
+        void mothurOutJustToScreen(string); //writes to cout
 		void mothurOutJustToLog(string);
 		void errorOut(exception&, string, string);
 		void closeLog();
@@ -69,17 +70,19 @@ class MothurOut {
 		vector<string> binLabelsInFile;
 		vector<string> currentBinLabels;
 		string saveNextLabel, argv, sharedHeaderMode, groupMode;
-		bool printedHeaders, commandInputsConvertError, changedSeqNames;
+		bool printedHeaders, commandInputsConvertError, changedSeqNames, modifyNames;
 		
 		//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&);
+		vector<unsigned long long> divideFile(string, int&); //divides splitting unevenness by sequence
+        vector<unsigned long long> divideFilePerLine(string, int&); //divides splitting unevenness at line breaks
 		int divideFile(string, int&, vector<string>&);
 		vector<unsigned long long> setFilePosEachLine(string, int&);
 		vector<unsigned long long> setFilePosFasta(string, int&);
 		string sortFile(string, string);
 		int appendFiles(string, string);
+        int appendFilesWithoutHeaders(string, string);
 		int renameFile(string, string); //oldname, newname
 		string getFullPathName(string);
         string findProgramPath(string programName);
@@ -160,6 +163,7 @@ class MothurOut {
         vector<double> getStandardDeviation(vector< vector<double> >&);
         vector<double> getStandardDeviation(vector< vector<double> >&, vector<double>&);
         vector<double> getAverages(vector< vector<double> >&);
+        double getAverage(vector<double>);
         vector< vector<seqDist> > getStandardDeviation(vector< vector< vector<seqDist> > >&);
         vector< vector<seqDist> > getStandardDeviation(vector< vector< vector<seqDist> > >&, vector< vector<seqDist> >&);
         vector< vector<seqDist> > getAverages(vector< vector< vector<seqDist> > >&, string);
@@ -168,7 +172,7 @@ class MothurOut {
 		int control_pressed;
 		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/getCurrentTypes.
+		//current files - if you add a new type you must edit optionParser->getParameters, get.current and set.current commands and mothurOut->printCurrentFiles/clearCurrentFiles/getCurrentTypes. add a get and set function.
 		string getPhylipFile()		{ return phylipfile;		}
 		string getColumnFile()		{ return columnfile;		}
 		string getListFile()		{ return listfile;			}
@@ -191,6 +195,7 @@ class MothurOut {
 		string getFlowFile()		{ return flowfile;			}
         string getBiomFile()		{ return biomfile;			}
         string getCountTableFile()	{ return counttablefile;	}
+        string getSummaryFile()     { return summaryfile;       }
 		string getProcessors()		{ return processors;		}
 		
 		void setListFile(string f)			{ listfile = getFullPathName(f);			}
@@ -214,6 +219,7 @@ class MothurOut {
 		void setTaxonomyFile(string f)		{ taxonomyfile = getFullPathName(f);		}
 		void setFlowFile(string f)			{ flowfile = getFullPathName(f);			}
         void setBiomFile(string f)			{ biomfile = getFullPathName(f);			}
+        void setSummaryFile(string f)		{ summaryfile = getFullPathName(f);			}
         void setCountTableFile(string f)	{ counttablefile = getFullPathName(f);	groupMode = "count";	}
         void setProcessors(string p)		{ processors = p; mothurOut("\nUsing " + toString(p) + " processors.\n");	}
 		
@@ -251,6 +257,7 @@ class MothurOut {
 			flowfile = "";
             biomfile = "";
             counttablefile = "";
+            summaryfile = "";
 			gui = false;
 			printedHeaders = false;
 			commandInputsConvertError = false;
@@ -259,6 +266,7 @@ class MothurOut {
 			sharedHeaderMode = "";
             groupMode = "group";
             changedSeqNames = false;
+            modifyNames = true;
 		}
 		~MothurOut();
 
@@ -267,7 +275,7 @@ class MothurOut {
 		string releaseDate, version;
 	
 		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;
+		string orderfile, treefile, sharedfile, ordergroupfile, relabundfile, fastafile, qualfile, sfffile, oligosfile, processors, flowfile, counttablefile, summaryfile;
 
 		vector<string> Groups;
 		vector<string> namesOfGroups;