X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mothurout.h;h=0d2e86f24cb258b24e78367e1427fc7ee2bc7d31;hb=974f20de01dc6ae71bbb0a7baf8860059cd2f27f;hp=98565dc547d1e81dc03d88c9a526983727c1b124;hpb=f06b339c5fc4b6d1b9d2a08fe16bf7670bf7aeb4;p=mothur.git

diff --git a/mothurout.h b/mothurout.h
index 98565dc..0d2e86f 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
@@ -111,6 +111,7 @@ class MothurOut {
 		int readNames(string, vector<seqPriorityNode>&, map<string, 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, intDist&); //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.
 	
@@ -119,7 +120,9 @@ class MothurOut {
 		bool checkReleaseVersion(ifstream&, string);
 		bool anyLabelsToProcess(string, set<string>&, string);
 		bool inUsersGroups(vector<string>, vector<string>);
+        bool inUsersGroups(vector<int>, vector< vector<int> >);
 		bool inUsersGroups(string, vector<string>);
+        bool inUsersGroups(int, vector<int>);
 		void getNumSeqs(ifstream&, int&);
 		int getNumSeqs(ifstream&);
 		int getNumNames(string);
@@ -138,8 +141,11 @@ class MothurOut {
 		void splitAtDash(string&, vector<string>&);
 		void splitAtChar(string&, vector<string>&, char);
         void splitAtChar(string&, string&, char);
+        vector<string> splitWhiteSpaceWithQuotes(string);
 		int removeConfidences(string&);
+        string removeQuotes(string);
         string makeList(vector<string>&);
+        bool isSubset(vector<string>, vector<string>); //bigSet, subset
 		
 		//math operation
 		int factorial(int num);
@@ -148,6 +154,7 @@ class MothurOut {
 		float roundDist(float, int);
 		unsigned int fromBase36(string);
 		int getRandomIndex(int); //highest
+        double getStandardDeviation(vector<int>&);
 
 		int control_pressed;
 		bool executing, runParse, jumble, gui, mothurCalling, debug;
@@ -179,7 +186,7 @@ class MothurOut {
 		
 		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);			}	
@@ -198,7 +205,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 setCountTableFile(string f)	{ counttablefile = 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();
@@ -241,6 +248,7 @@ class MothurOut {
             mothurCalling = false;
             debug = false;
 			sharedHeaderMode = "";
+            groupMode = "group";
 		}
 		~MothurOut();